Commit Graph

658 Commits

Author SHA1 Message Date
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
LetterJay
7740e1bfee fix missing icon for the carbine 2017-04-27 14:33:41 -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
86353dc472 Merge pull request #584 from Citadel-Station-13/upstream-merge-26385
[MIRROR] Ghosts fresh clones instantly instead of waiting
2017-04-27 12:52:51 -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
98be8d236f Merge pull request #587 from Citadel-Station-13/upstream-merge-26615
[MIRROR] Fixes a bad proc definition
2017-04-27 12:51:49 -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
7439814b72 Merge pull request #590 from Citadel-Station-13/upstream-merge-26574
[MIRROR] Lowers max list size in vv
2017-04-27 12:50:14 -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
ef2bce9342 Merge pull request #599 from Citadel-Station-13/upstream-merge-26583
[MIRROR] Makes the GLOB stat_entry more indicative that you can edit it
2017-04-27 12:48:10 -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
0ebbadbe6c Merge pull request #603 from Citadel-Station-13/upstream-merge-26581
[MIRROR] Small fix
2017-04-27 12:47:18 -05:00
LetterJay
d7a338932a Merge pull request #600 from Citadel-Station-13/upstream-merge-26548
[MIRROR] Fixes map rotation with disabled voting
2017-04-27 12:47:02 -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
1f2c0e898e Small fix 2017-04-27 09:36:25 -05:00
CitadelStationBot
870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -05:00
CitadelStationBot
0d58175118 Fixes map rotation with disabled voting 2017-04-27 09:20:53 -05:00
CitadelStationBot
3988f25647 Makes the GLOB stat_entry more indicative that you can edit it 2017-04-27 09:18:48 -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
27feafc699 Changes all instances of "RD Console" to "R&D Console" 2017-04-27 03:00:07 -05:00
CitadelStationBot
bba83f9291 Lowers max list size in vv 2017-04-26 20:15:54 -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
a3cd0d980a Fixes a bad proc definition 2017-04-26 19:29:03 -05:00
CitadelStationBot
16ffd5f8dd Ghosts fresh clones instantly instead of waiting 2017-04-26 17:15:51 -05:00
CitadelStationBot
3a80e3529f Fixes chameleon guns projectile 2017-04-26 17:15:44 -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
CitadelStationBot
3d2f91d0c7 Removes a lavaland_surface_ww_vault.dmm because its just bad. (#536) 2017-04-26 11:08:30 -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
Poojawa
328ddaba1f Delete window.dm.rej 2017-04-26 10:15:54 -05:00
Poojawa
bb97f09b74 Update window.dm 2017-04-26 10:15:44 -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
f881683902 Fixes windows going invisible (#567) 2017-04-26 10:11:11 -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
LetterJay
a8c4c86e1c REJ CLEANUP! 2017-04-26 06:48:41 -05:00
LetterJay
aa27e92afb Merge pull request #574 from Citadel-Station-13/upstream-merge-26474
[MIRROR] Gas injectors are now buildable
2017-04-26 06:45:09 -05:00
LetterJay
c65d02f001 Merge pull request #569 from Citadel-Station-13/upstream-merge-26537
[MIRROR] Rod Form now costs 3 points
2017-04-26 06:38:48 -05:00
LetterJay
8b31b86e0f manual merge 2017-04-26 06:38:01 -05:00
LetterJay
dbaca1843d Merge pull request #570 from Citadel-Station-13/upstream-merge-26539
[MIRROR] The blood loss change everyone's been raving about
2017-04-26 06:30:00 -05:00
LetterJay
417b80bb42 Merge pull request #516 from Verkister/master
Bringing back the dogborgos.
2017-04-26 06:24:26 -05:00