Commit Graph

5281 Commits

Author SHA1 Message Date
LetterJay
5dbcbf5689 Update podpeople.dm 2017-10-28 00:23:30 -05:00
LetterJay
2d8468aed0 Update _cit_helpers.dm 2017-10-28 00:23:25 -05:00
LetterJay
878a52ab3f Update furrypeople.dm 2017-10-22 23:43:10 -05:00
LetterJay
1bcb5f2c86 Update skeletons.dm 2017-10-22 10:48:29 -05:00
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
LetterJay
655478e014 Merge pull request #3485 from Citadel-Station-13/upstream-merge-31774
[MIRROR] reorder carbon destroy to fix ghosting
2017-10-20 10:32:29 -04:00
CitadelStationBot
f19665e698 [MIRROR] Fixes another stack overflow in pull code (#3515)
* Merge pull request #31905 from AnturK/anotherloop

Fixes another stack overflow in pull code

* Fixes another stack overflow in pull code
2017-10-20 01:42:18 -05:00
CitadelStationBot
b044758315 [MIRROR] Fixes a parrot posession runtime (#3516)
* Fixes a parrot posession runtime (#31879)

* Fixes a parrot posession runtime
2017-10-20 01:41:28 -05:00
CitadelStationBot
46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513)
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
2017-10-20 01:40:15 -05:00
LetterJay
bb00cb7075 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-19 09:01:55 -05:00
LetterJay
b6293e7ece potential IRC fix 2017-10-19 09:01:15 -05:00
LetterJay
72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819
[MIRROR] Fixes AI visiblity checks
2017-10-19 09:24:28 -04:00
LetterJay
fe05d8aaaf Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
2017-10-19 09:24:04 -04:00
LetterJay
7fce4c7bcc Merge pull request #3505 from Citadel-Station-13/upstream-merge-31778
[MIRROR] expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode
2017-10-19 09:23:40 -04:00
LetterJay
bffdbf72fb Merge pull request #3503 from Citadel-Station-13/upstream-merge-31852
[MIRROR] You will no longer trip on inactive Honkbots. [Tweak]
2017-10-19 09:22:26 -04:00
LetterJay
9d967c4b09 Merge pull request #3502 from Citadel-Station-13/upstream-merge-31813
[MIRROR] Cleans up set and adjust procs for disgust and drugginess a bit
2017-10-19 09:21:23 -04:00
LetterJay
e876293476 Merge pull request #3499 from Citadel-Station-13/upstream-merge-31773
[MIRROR] Showers clean contamination and make sound
2017-10-19 09:20:02 -04:00
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
YPOQ
d04818e6f9 Fixes AI visiblity checks (#31819) 2017-10-19 05:42:52 -05:00
vuonojenmustaturska
7045809aa2 Stops manned turrets from firing when the user unbuckles themselves from the turret (#31754)
* The clown is drunk, and the cards of death wait on him

* Update power.dm
2017-10-19 05:41:41 -05:00
vuonojenmustaturska
360d883879 expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
2017-10-19 04:57:49 -05:00
oranges
7517b6ba19 Merge pull request #31852 from Mercenaryblue/tweak_honkbot
You will no longer trip on inactive Honkbots. [Tweak]
2017-10-19 04:07:40 -05:00
Poojawa
45eeebd001 Sleeper nerfs (#3478) 2017-10-19 04:01:59 -05:00
oranges
8c750341dc Merge pull request #31813 from Qustinnus/IMGONNACLAMPEM
Cleans up set and adjust procs for disgust and drugginess a bit
2017-10-19 03:55:17 -05:00
Emmett Gaines
ee3d18fe58 Showers clean contamination and make sound (#31773)
* fucking showers

* cleanup
2017-10-19 03:29:08 -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