CitadelStationBot
|
caaf42815a
|
Changes some << to to_chat
|
2017-04-28 06:14:47 -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
|
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
|
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 |
|
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
|
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 |
|
CitadelStationBot
|
45e9b1644e
|
Gas injectors are now buildable
|
2017-04-26 04:35:40 -05:00 |
|
CitadelStationBot
|
5f09fa4de8
|
The blood loss change everyone's been raving about
|
2017-04-25 23:13:45 -05:00 |
|
LetterJay
|
5d4afa23bc
|
Merge pull request #561 from Citadel-Station-13/upstream-merge-25093
[MIRROR] Refactors T-Ray Scanners
|
2017-04-25 22:29:57 -05:00 |
|
LetterJay
|
b492fccffa
|
removes rogue proc
|
2017-04-25 22:15:07 -05:00 |
|
LetterJay
|
f70e00d8cd
|
Merge pull request #531 from Citadel-Station-13/upstream-merge-26441
[MIRROR] Plasmamen tongues, plasmaman lung sprites
|
2017-04-25 22:00:26 -05:00 |
|
LetterJay
|
6b303ccecc
|
/tg/ has tongues in their own file, maybe we should too?
|
2017-04-25 21:52:13 -05:00 |
|
LetterJay
|
73456c9e9a
|
REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK.
|
2017-04-25 21:40:46 -05:00 |
|
LetterJay
|
6dc70fc02f
|
Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
[MIRROR] Changed alternate appearances to /datum/atom_hud s
|
2017-04-25 21:39:14 -05:00 |
|
LetterJay
|
feb3569d13
|
mob.dm manual merge
|
2017-04-25 21:25:08 -05:00 |
|
LetterJay
|
993bea0342
|
Merge pull request #560 from Citadel-Station-13/upstream-merge-26480
[MIRROR] Piggybacking on humans now takes a 1.5 second delay before you actually grab on
|
2017-04-25 21:16:01 -05:00 |
|
LetterJay
|
87611ef7c1
|
Merge pull request #564 from Citadel-Station-13/upstream-merge-26584
[MIRROR] Fixes monkey transformation instantly killing a person
|
2017-04-25 20:36:02 -05:00 |
|
LetterJay
|
2102b20409
|
Merge pull request #562 from Citadel-Station-13/upstream-merge-26507
[MIRROR] Removes a few spawns
|
2017-04-25 20:35:42 -05:00 |
|
LetterJay
|
213799bfc3
|
Merge pull request #558 from Citadel-Station-13/upstream-merge-26522
[MIRROR] Fixes alien spit visual not disappearing
|
2017-04-25 20:34:30 -05:00 |
|
LetterJay
|
6fa7305e27
|
Delete slime.dm.rej
|
2017-04-25 20:33:07 -05:00 |
|
LetterJay
|
b8ed1fc43e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-04-25 20:27:20 -05:00 |
|
LetterJay
|
0a77dfcce5
|
manual merge for slime.dm
|
2017-04-25 20:23:00 -05:00 |
|
LetterJay
|
fd26d0eccd
|
Merge pull request #555 from Citadel-Station-13/upstream-merge-26501
[MIRROR] Small abductors refactor
|
2017-04-25 20:10:20 -05:00 |
|
LetterJay
|
2362b1ff46
|
Merge pull request #543 from Citadel-Station-13/upstream-merge-26456
[MIRROR] fixes people with no skin/golems dropping skin when gibbed
|
2017-04-25 20:07:26 -05:00 |
|