Commit Graph

5256 Commits

Author SHA1 Message Date
LetterJay
a1643221aa Merge pull request #3498 from Citadel-Station-13/upstream-merge-31751
[MIRROR] Adds radiation goggles and a small rewrite to make adding more view modes in the future easier
2017-10-19 09:14:13 -04:00
LetterJay
7ca5646119 Merge pull request #3497 from Citadel-Station-13/upstream-merge-31711
[MIRROR] Removes crewpinpointer from wardens locker
2017-10-19 09:14:00 -04:00
LetterJay
c690ee90e5 Merge pull request #3496 from Citadel-Station-13/upstream-merge-31609
[MIRROR] Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes
2017-10-19 09:12:26 -04:00
LetterJay
94c6a859bf Merge pull request #3495 from Citadel-Station-13/upstream-merge-31859
[MIRROR] Fixes an edge case in portable atmos connection check
2017-10-19 09:11:37 -04:00
LetterJay
8f51e048e9 Merge pull request #3493 from Citadel-Station-13/upstream-merge-31853
[MIRROR] fixes handbuilt gas meters
2017-10-19 09:09:07 -04:00
LetterJay
02f0c1573a Merge pull request #3491 from Citadel-Station-13/upstream-merge-31851
[MIRROR] Fixes liches not blocking roundend properly.
2017-10-19 09:08:25 -04:00
LetterJay
6a1035b6f4 Merge pull request #3483 from Citadel-Station-13/upstream-merge-31823
[MIRROR] Very minor refactor of gas mixture heat_capacity()
2017-10-19 09:07:20 -04:00
LetterJay
9076721384 Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842
[MIRROR] GPS renaming fix
2017-10-19 09:05:18 -04:00
LetterJay
96e8196175 Merge pull request #3481 from Citadel-Station-13/upstream-merge-31839
[MIRROR] Rewords networked fibers description
2017-10-19 09:02:50 -04:00
LetterJay
cf73ddcdbb Merge pull request #3489 from Citadel-Station-13/upstream-merge-31847
[MIRROR] Fixes a misnamed arg in a clockwork proc
2017-10-19 09:02:40 -04:00
LetterJay
d07b44268c Merge pull request #3487 from Citadel-Station-13/upstream-merge-31820
[MIRROR] Humans now use the generic fire sprite if they have 3 or less firestacks
2017-10-19 08:57:29 -04:00
LetterJay
b31d291ede Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753
[MIRROR] Radiation makes you vomit blood and some more balance changes
2017-10-19 08:57:18 -04:00
LetterJay
b8267b062e Merge pull request #3484 from Citadel-Station-13/upstream-merge-31830
[MIRROR] Gives engi borgs geiger counters
2017-10-19 08:56:44 -04:00
LetterJay
626993d116 Merge pull request #3480 from Citadel-Station-13/upstream-merge-31836
[MIRROR] Fixes recipient in pda logs
2017-10-19 08:56:25 -04:00
Poojawa
45eeebd001 Sleeper nerfs (#3478) 2017-10-19 04:01:59 -05:00
Emmett Gaines
28f3bc0918 Adds radiation goggles and a small rewrite to make adding more view modes in the future easier (#31751)
* adds radiation goggles

* cleanup
2017-10-19 02:54:23 -05:00
jughu
25c37ac9bb Removes crewpinpointer from wardens locker (#31711)
* Update security.dm

* Update security.dm
2017-10-19 02:02:25 -05:00
kevinz000
0aa2e6b6a2 Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes (#31609)
* Update alert.dm

* better fix
2017-10-19 02:01:14 -05:00
duncathan salt
c03f112f9b fixes kevinz's silly mistake (#31859) 2017-10-19 01:42:45 -05:00
duncathan salt
bcf187465a fixes handbuilt gas meters (#31853) 2017-10-18 22:02:55 -05:00
LetterJay
d85dfb4aed i hate it all 2017-10-18 20:41:38 -05:00
AnturK
daeffc5b03 Fixes liches not blocking roundend properly. (#31851) 2017-10-18 18:27:14 -05:00
LetterJay
fa7bbd50e5 fuck 2017-10-18 15:25:33 -05:00
LetterJay
8eb325ba1f icon 2017-10-18 15:15:47 -05:00
Robustin
1945f16dee Bad Argument Runtime Removed 2017-10-18 11:56:09 -05:00
MoreRobustThanYou
dc74b9d488 Humans now use the generic sprite if they have 3 or less firestacks (#31820)
To show that they're still on fire, but not AS on fire as you would be with 4+ firestacks
2017-10-18 10:18:14 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
LetterJay
215681a23e AHHHHHHHHHHH 2017-10-18 08:10:12 -05:00
LetterJay
5760fbfc2f MORE CUSTOM ITEMS 2017-10-18 08:07:31 -05:00
Leo
5ad2b5d866 Merge pull request #31830 from ShizCalev/geiger-borg
Gives engi borgs geiger counters
2017-10-18 07:24:53 -05:00
Leo
371857cc35 Merge pull request #31823 from duncathan/atmos-patch12
Very minor refactor of gas mixture heat_capacity()
2017-10-18 07:24:46 -05:00
Leo
29e20a55de Merge pull request #31842 from GunHog/GPS_Name_Fix
GPS renaming fix
2017-10-18 07:23:31 -05:00
Leo
c3b7b324e4 Merge pull request #31839 from ShizCalev/networked-fibers-grammar
Rewords networked fibers description
2017-10-18 07:23:20 -05:00
Leo
060d43768e Merge pull request #31836 from AnturK/pdalogfix
Fixes recipient in pda logs
2017-10-18 07:23:12 -05:00
LetterJay
250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630
[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
LetterJay
799e52c5b0 Merge pull request #3479 from Citadel-Station-13/upstream-merge-31838
[MIRROR] Fixes foam layer popping
2017-10-18 07:42:48 -04:00
LetterJay
c2be4a21a6 Merge pull request #3476 from Citadel-Station-13/upstream-merge-31831
[MIRROR] Filters allow air to pass through when not set to filter any gas
2017-10-18 07:39:26 -04:00
LetterJay
45c96ae08e Merge pull request #3475 from Citadel-Station-13/upstream-merge-31821
[MIRROR] Removes toggle camera light verb
2017-10-18 07:39:15 -04:00
LetterJay
9036bc1d5d Merge pull request #3474 from yourdoom9898/master
Removed "You feel very bloated!" chat message
2017-10-18 07:39:05 -04:00
LetterJay
92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809
[MIRROR] Cleans up some istypes not using helpers
2017-10-18 07:37:43 -04:00
LetterJay
b89142a35b Merge pull request #3471 from Citadel-Station-13/upstream-merge-31810
[MIRROR] Fixes being able to pick up brass chairs
2017-10-18 07:37:05 -04:00
LetterJay
481a3ef518 Merge pull request #3470 from Citadel-Station-13/upstream-merge-31788
[MIRROR] Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles.
2017-10-18 07:36:55 -04:00
LetterJay
9e5c84372a Merge pull request #3469 from Citadel-Station-13/upstream-merge-31793
[MIRROR] Fixes slapper inhand
2017-10-18 07:36:45 -04:00
LetterJay
6fe6c4ca63 Merge pull request #3467 from Citadel-Station-13/upstream-merge-31803
[MIRROR] Fixes disabling leg actuators not setting power drain per step to the correct value
2017-10-18 07:36:31 -04:00
LetterJay
5bfabefc84 Merge pull request #3466 from Citadel-Station-13/upstream-merge-31806
[MIRROR] Fixes for Smoke Machine Fixes
2017-10-18 07:35:46 -04:00
LetterJay
93e6e4a798 Merge pull request #3463 from Citadel-Station-13/upstream-merge-31784
[MIRROR] Next round of shuttle fixes at the cost of a small piece of my sanity
2017-10-18 07:35:34 -04:00
LetterJay
271a287b52 Merge pull request #3461 from Citadel-Station-13/upstream-merge-31795
[MIRROR] Random runtime fixes.
2017-10-18 07:35:03 -04:00
LetterJay
47fa7b353c Merge pull request #3460 from Citadel-Station-13/upstream-merge-31800
[MIRROR] Fixes automatic fire on guns
2017-10-18 07:34:53 -04:00
LetterJay
bab51df97e Merge pull request #3459 from Citadel-Station-13/upstream-merge-31782
[MIRROR] Corrects soil description
2017-10-18 07:34:37 -04:00
LetterJay
ad35b9f65c Merge pull request #3458 from Citadel-Station-13/upstream-merge-31792
[MIRROR] Corrects caravan ambush tool speed
2017-10-18 07:34:27 -04:00