Updating branch #15
Merged
Updating branch #15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replaced CAN_JOIN with IS_RESTRICTED, cannot select on char setup
Included freeze into Baystation.dme/.int
-cleartox() added: removes all gases and replaces them with 80%n2 and 20%o2 = Air
Fixing Aphelion text and opening up the hub PW.
-Mods may use ClearTox() aswell
Conflicts: baystation12.int
Instead of 450 Biomass the Cloner now starts with 900! Yay!
-added Badpipe var for valve, normally set to 0 -edited badpipe to 1 for alerts for Co2, Phoron and N2O!
Fixing unfreeze
-Rejuv now fixes Halloss damage, not the slowdown yet because i dont know how *shrug*
changed race specific secondary languages to restricted to prevent them showing up on the character creation options.
Changed from 0/1/3 to 0/0/3 to prevent breaching
Requires_power = 0 set
Three new bullet sprites for use
Health, Hydro, Anti, Robot, and detective scanners
Gave mentors the ability to actually rejuvenate. Thanks for that, bay.
updated station.dm
xray guns instead of snipers
Should be able to freeze and unfreeze players at will.
Replaced CAN_JOIN with IS_RESTRICTED, cannot select on char setup
-CURRENTLY NOT ADDED TO THE PERMS, THATS A TO-DO :3
Fixed
-Mods now may use Clean() -Admins now may use Clean()
I forgot to select that file, dumb me
Included freeze into Baystation.dme/.int
-cleartox() added: removes all gases and replaces them with 80%n2 and 20%o2 = Air
necessary
Fixing broken code from the merge.
Maybe actually haven't fucked it this time
Changed all administrative OOC colors to be Baystation12#3957.
Small edit that makes lights illuminate two more tiles.
Decreased the time it took for cryostorage to remove a player from the round from 30 minutes to 10 minutes.
Update outsider.dm
Brightness change.
Admin OOC colour and cryo sleep fix.
This reverts commit bd5cee9.
This reverts commit 66a8410.
Allows formatting of all sorts for Direct Narration and Subtle Messaging via the removal of Sanitize() on the functions.
Direct Narration/Subtle Messaging Formatting Fix
Simple change that adds the hailer mask.
Retarded syntax stuff. Didn't take off the ending ) from the sanitize(). Whoops.
Fix to direct narration fix
Simply added 14 slots to engineering and captain bags. Added 10 slots to security and medical bags.
Backpacks and hailer masks!
This reverts commit 8e9a1ba.
This reverts commit f1c372a.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Patching content