Commit Graph

466 Commits

Author SHA1 Message Date
CitadelStationBot
e1883354ba Nerfs and buffs The Traps 2017-04-28 21:03:57 -05:00
LetterJay
a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
[MIRROR] Initialize Refactor
2017-04-28 09:29:00 -05:00
LetterJay
a4751682f4 Merge pull request #621 from LetterJay/muh-ears
Fixes runtime when carbon mobs have no earwear
2017-04-28 09:13:04 -05:00
LetterJay
085b421348 rej fixes 2017-04-28 09:03:56 -05:00
LetterJay
8d37d21df4 Merge pull request #607 from Citadel-Station-13/upstream-merge-26624
[MIRROR] Fixes changelog assets
2017-04-28 08:19:41 -05:00
LetterJay
d34b65da86 Merge pull request #610 from Citadel-Station-13/upstream-merge-26612
[MIRROR] Even admin-called shuttles will be affected by alert level
2017-04-28 08:19:09 -05:00
LetterJay
5d23473b78 Merge pull request #611 from Citadel-Station-13/upstream-merge-26617
[MIRROR] Fixes the banana honk recipe.
2017-04-28 08:18:51 -05:00
LetterJay
4873b565a4 Merge pull request #614 from Citadel-Station-13/upstream-merge-26521
[MIRROR] Fixes templates/ruins not updating area list
2017-04-28 08:18:31 -05:00
LetterJay
0433e76d45 Merge pull request #616 from Citadel-Station-13/upstream-merge-26660
[MIRROR] Fixes blank alerts
2017-04-28 08:18:17 -05:00
LetterJay
f7fa4d9843 Merge pull request #615 from Citadel-Station-13/upstream-merge-26187
[MIRROR] Adds a delete verb to the vv_drop_down
2017-04-28 08:18:07 -05:00
LetterJay
7bc01ae8c6 Merge pull request #617 from Citadel-Station-13/upstream-merge-26657
[MIRROR] Fixes ircadminwho making the wrong list check
2017-04-28 08:17:53 -05:00
LetterJay
68d8f3658c Merge pull request #620 from Citadel-Station-13/upstream-merge-26634
[MIRROR] Changes some << to to_chat
2017-04-28 08:17:23 -05:00
LetterJay
b252a53b25 Merge pull request #595 from Citadel-Station-13/upstream-merge-26551
[MIRROR] Changes ID card program to only require head of staff access to download
2017-04-28 08:15:55 -05:00
LetterJay
0331578b08 fix for ear runtime 2017-04-28 08:14:01 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
6e874d1089 Fixes ircadminwho making the wrong list check 2017-04-27 17:56:36 -05:00
CitadelStationBot
5ee703d21f Fixes blank alerts 2017-04-27 17:35:12 -05:00
CitadelStationBot
df4f3aaaad Adds a delete verb to the vv_drop_down 2017-04-27 17:10:44 -05:00
CitadelStationBot
a0c1f979dc Fixes templates/ruins not updating area list 2017-04-27 17:02:33 -05:00
CitadelStationBot
b9cc40277b Fixes the banana honk recipe. 2017-04-27 16:55:15 -05:00
CitadelStationBot
57a0e05679 Even admin-called shuttles will be affected by alert level 2017-04-27 16:55:12 -05:00
CitadelStationBot
404b2314c5 Fixes changelog assets 2017-04-27 15:38:42 -05:00
LetterJay
64f0952588 Merge pull request #588 from Citadel-Station-13/upstream-merge-26589
[MIRROR] Anomalous crystal examine and code cleanup
2017-04-27 12:53:17 -05:00
LetterJay
a2873d5b9e Merge pull request #582 from Citadel-Station-13/upstream-merge-26471
[MIRROR] Fixes chameleon guns projectile
2017-04-27 12:52:14 -05:00
LetterJay
513b37beba Merge pull request #596 from Citadel-Station-13/upstream-merge-26607
[MIRROR] Fixes SDQL global procs
2017-04-27 12:51:35 -05:00
LetterJay
c385ef2a90 Merge pull request #589 from Citadel-Station-13/upstream-merge-26582
[MIRROR] Keeps SSnpc from sleeping
2017-04-27 12:51:20 -05:00
LetterJay
cf41ec187a Merge pull request #592 from Citadel-Station-13/upstream-merge-26368
[MIRROR] Changes all instances of "RD Console" to "R&D Console"
2017-04-27 12:49:49 -05:00
LetterJay
10573ea933 Merge pull request #597 from Citadel-Station-13/upstream-merge-26603
[MIRROR] Changes the naming of an ammo to make it more distinct
2017-04-27 12:49:14 -05:00
LetterJay
22440109e2 Merge pull request #598 from Citadel-Station-13/upstream-merge-26605
[MIRROR] Adds crayon grinding
2017-04-27 12:48:27 -05:00
LetterJay
dcf1c72cfc Merge pull request #601 from Citadel-Station-13/upstream-merge-26557
[MIRROR] Minor IV/bloodbag grammar fixes
2017-04-27 12:47:50 -05:00
LetterJay
19b2723aa5 tweak 2017-04-27 11:48:46 -05:00
LetterJay
3103167a87 more expensive way to render, but MA isn't working or I'm overlooking something 2017-04-27 11:46:24 -05:00
CitadelStationBot
870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -05:00
CitadelStationBot
83916bee5d Adds crayon grinding 2017-04-27 09:17:44 -05:00
CitadelStationBot
fd3fb360df Changes the naming of an ammo to make it more distinct 2017-04-27 09:17:40 -05:00
CitadelStationBot
d77a2bf87d Fixes SDQL global procs 2017-04-27 09:13:33 -05:00
CitadelStationBot
c0301fbf89 Changes ID card program to only require head of staff access to download 2017-04-27 06:36:48 -05:00
CitadelStationBot
27feafc699 Changes all instances of "RD Console" to "R&D Console" 2017-04-27 03:00:07 -05:00
CitadelStationBot
2044f10302 Keeps SSnpc from sleeping 2017-04-26 19:33:14 -05:00
CitadelStationBot
c2de4d175a Anomalous crystal examine and code cleanup 2017-04-26 19:30:08 -05:00
CitadelStationBot
3a80e3529f Fixes chameleon guns projectile 2017-04-26 17:15:44 -05:00
CitadelStationBot
cea81a3357 Initialize Refactor 2017-04-26 16:03:17 -05:00
CitadelStationBot
e7df2bc14a [MIRROR] Minor refactors (#515)
* Minor refactors

* Update client_procs.dm

* Delete client_procs.dm.rej
2017-04-26 11:13:41 -05:00
CitadelStationBot
87ce25df9b Removes a unused chem (#576) 2017-04-26 11:09:00 -05:00
Poojawa
8ec4cbbb9f Fixes carelessness. (#577)
* Update hud.dm

* Delete hud.dm.rej

* Update alternate_appearance.dm

* Delete alternate_appearance.dm.rej

* Delete mob.dm.rej

* Update mob.dm
2017-04-26 10:37:57 -05:00
CitadelStationBot
c5eeb2de67 Revert "Ghosts call Moved() after Move() (#26183)" (#510) 2017-04-26 10:11:47 -05:00
CitadelStationBot
b1d6b6a277 [MIRROR] Drake swooping is smoother and more dangerous (#571)
* Drake swooping is smoother and more dangerous

* Update dragon.dm

* Delete dragon.dm.rej
2017-04-26 10:11:33 -05:00
CitadelStationBot
4cf23d086a Fixed nulls in the active_alternate_appearances list (#568) 2017-04-26 10:11:22 -05:00
CitadelStationBot
84321916a5 Refactors ears into organs (#513)
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
2017-04-26 09:52:35 -05:00
CitadelStationBot
a905c15dad Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00