Commit Graph

12455 Commits

Author SHA1 Message Date
CitadelStationBot 51b87c4921 [MIRROR] switch smoke machine general logging from admin to game log (#3527)
* switch smoke machine general logging from admin to game log, where it should be -- i missed this when i added the message_admins call

* switch smoke machine general logging from admin to game log
2017-10-21 03:46:41 -05:00
CitadelStationBot a7a5679ef9 [MIRROR] Fixes #31897 , cryo base disappearing (#3534)
* Fixes #31897 , cryo base disappearing (#31909)

* Fixes cryo base disappearing

* code fix instead of icon fix, adds failure feedback to cells

* Fixes #31897 , cryo base disappearing
2017-10-21 03:46:17 -05:00
CitadelStationBot ea99c01820 [MIRROR] Fixes simple mob flying corpses (#3521)
* Fixes simple mob flying corpses (#31794)

* makes simple mobs stop flying when they die

* Update simple_animal.dm

* Fixes simple mob flying corpses
2017-10-21 03:46:00 -05:00
Poojawa f993bbb6ee Fixes vore complaints with one weird trick (#3535) 2017-10-21 03:45:17 -05:00
CitadelStationBot 1a94726bdc [MIRROR] Fixes conflicting IDs on ruined whiteship (#3525)
* Fixes conflicting IDs

* Fixes conflicting IDs on ruined whiteship
2017-10-21 03:44:47 -05:00
CitadelStationBot 0ad6e36727 [MIRROR] Apprentice fixes (#3533)
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
2017-10-21 03:44:21 -05:00
CitadelStationBot fa220bcf9b [MIRROR] Cures cats of their rigor meowrtis (#3530)
* Merge pull request #31907 from Thunder12345/no_more_rigor_meowrtis

Cures cats of their rigor meowrtis

* Cures cats of their rigor meowrtis
2017-10-21 03:43:58 -05:00
Jordan Brown cd74a1333c Blank globals will no longer assign null to themselves 2017-10-21 01:31:23 -05:00
Michiyamenotehifunana b34a10396a Model D is now disabler/kill only and has more obvious inhands
Now it's even more obvious than the regular egun's inhands and just has disabler/kill instead of stun/kill.
2017-10-21 13:30:04 +08:00
Michiyamenotehifunana f41c8ccccf Nerfs nerfs
NO MORE INSTANT BAGGABLE STUNS FROM AUTOLATHES!
2017-10-21 11:43:41 +08:00
CitadelStationBot c0e00ab5ca [MIRROR] [s] Fixes datum antag is_banned (#3523)
* Fixes datum antag jobbans (#31901)

* [s] Fixes datum antag is_banned
2017-10-20 12:48:15 -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
Michiyamenotehifunana d62ddf181b Adds inhands for the Model D
They follow the same color as the regular sprite!
2017-10-20 23:10:22 +08:00
LetterJay c0ddbacd29 Update blob.dm 2017-10-20 09:33:50 -05:00
LetterJay b7c8330761 Update blob_report.dm 2017-10-20 09:33:39 -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
oranges 7c020af628 Fixes stack overflow in orbit datum 2017-10-19 18:57:05 -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
Michiyamenotehifunana 165ee70549 Removed disablers from the Model D
So that it isn't another lame HoS/Tac egun clone (although the Tac egun can fire twice the amount of tasers) and also puts it in line with the ALP of an era long gone.
2017-10-19 20:45:02 +08: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
Michiyamenotehifunana 5071b3438c RECOLORABLE GUN MEMES
Includes new ammo types, recolorable guns, partially recolorable guns, non-recolorable guns, and implementations into the map.
2017-10-19 18:30:44 +08: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