Joan Lung
|
2dc3868949
|
Makes shiny versions of lavaland monsters slightly more distinct (#30502)
* Makes shiny versions of lavaland monsters slightly more distinct
* classic
* lower drop
* tweak drops
* this is kind of absurd
|
2017-09-11 20:54:55 -05:00 |
|
Poojawa
|
2629d3b87d
|
Adds horse, cow tails, Sergal ears/tails also (#2695)
* Adds horse, sergal, cow tails
* Slight tweaks before bed
* sprite tweaks
|
2017-09-11 20:22:21 -05:00 |
|
LetterJay
|
34d7f79cd3
|
Merge pull request #2687 from Citadel-Station-13/upstream-merge-30542
[MIRROR] Changes golem shell attackby istype chain to use an assoc list instead of an istype chain
|
2017-09-11 18:55:32 -05:00 |
|
LetterJay
|
beed20c130
|
Update life.dm
|
2017-09-11 18:52:14 -05:00 |
|
LetterJay
|
e6c9911ae2
|
Merge pull request #2660 from Citadel-Station-13/upstream-merge-30399
[MIRROR] chainsaws rebalance, but working this time :)
|
2017-09-11 18:47:14 -05:00 |
|
LetterJay
|
5c9ba3593a
|
Merge pull request #2678 from Citadel-Station-13/upstream-merge-30482
[MIRROR] People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit
|
2017-09-11 18:45:22 -05:00 |
|
LetterJay
|
5c42666355
|
Merge pull request #2707 from Citadel-Station-13/upstream-merge-30590
[MIRROR] Fixes Punpun (again)
|
2017-09-11 18:45:06 -05:00 |
|
LetterJay
|
b73b6a967a
|
Merge pull request #2680 from Citadel-Station-13/upstream-merge-30519
[MIRROR] In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed
|
2017-09-11 18:44:40 -05:00 |
|
LetterJay
|
e5cc2c1e4e
|
Update one_click_antag.dm
|
2017-09-11 18:28:09 -05:00 |
|
LetterJay
|
c03fb31b1c
|
Update sql_message_system.dm
|
2017-09-11 18:27:47 -05:00 |
|
LetterJay
|
5fafa90538
|
Update secrets.dm
|
2017-09-11 18:27:20 -05:00 |
|
LetterJay
|
584bb8dc64
|
Update holder2.dm
|
2017-09-11 18:27:04 -05:00 |
|
LetterJay
|
15c4d34b55
|
Update create_turf.dm
|
2017-09-11 18:26:50 -05:00 |
|
LetterJay
|
98f6cf208b
|
Update create_object.dm
|
2017-09-11 18:26:36 -05:00 |
|
LetterJay
|
bb463cef48
|
Update create_mob.dm
|
2017-09-11 18:26:13 -05:00 |
|
LetterJay
|
16c7706618
|
Merge branch 'master' into upstream-merge-30117
|
2017-09-11 18:10:15 -05:00 |
|
LetterJay
|
e6cc0673aa
|
Merge branch 'master' into upstream-merge-30399
|
2017-09-11 18:07:15 -05:00 |
|
LetterJay
|
6cc0ea6af0
|
Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412
[MIRROR] Regularizes resisting out of containers
|
2017-09-11 18:05:52 -05:00 |
|
LetterJay
|
935ae98f4a
|
Merge branch 'master' into upstream-merge-29839
|
2017-09-11 18:03:51 -05:00 |
|
LetterJay
|
bfe633540a
|
Update human_movement.dm
|
2017-09-11 17:55:35 -05:00 |
|
LetterJay
|
6816b83a6d
|
Merge pull request #2673 from Citadel-Station-13/upstream-merge-30509
[MIRROR] num2text the Instances number
|
2017-09-11 17:53:54 -05:00 |
|
LetterJay
|
578846ba4b
|
Merge branch 'master' into upstream-merge-30519
|
2017-09-11 17:53:13 -05:00 |
|
LetterJay
|
c3a1c08206
|
Update smartfridge.dm
|
2017-09-11 17:51:49 -05:00 |
|
LetterJay
|
9adcc174b3
|
Update shuttle.dm
|
2017-09-11 17:09:44 -05:00 |
|
KorPhaeron
|
4d2fe460ed
|
Nightmare
|
2017-09-11 16:23:47 -05:00 |
|
LetterJay
|
9e73d297cc
|
Update security_levels.dm
|
2017-09-11 15:58:47 -05:00 |
|
LetterJay
|
97b25bc59a
|
Update vent_clog.dm
|
2017-09-11 15:58:12 -05:00 |
|
LetterJay
|
fe3d825596
|
Update spider_infestation.dm
|
2017-09-11 15:57:45 -05:00 |
|
LetterJay
|
12f17ecbe7
|
Update radiation_storm.dm
|
2017-09-11 15:57:15 -05:00 |
|
LetterJay
|
57343fa712
|
Update immovable_rod.dm
|
2017-09-11 15:56:25 -05:00 |
|
LetterJay
|
05efdd9ad3
|
Update sm_monitor.dm
|
2017-09-11 15:45:34 -05:00 |
|
LetterJay
|
804a59ad49
|
Update aux_base.dm
|
2017-09-11 15:45:11 -05:00 |
|
Jordan Brown
|
799ae80b8a
|
Missed some parentheses in multi Z
|
2017-09-11 15:43:50 -05:00 |
|
LetterJay
|
01920e5fea
|
Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220
[MIRROR] Adds Archaeology Component
|
2017-09-11 15:22:59 -05:00 |
|
LetterJay
|
1c757deb5b
|
Merge pull request #2650 from Citadel-Station-13/upstream-merge-30420
[MIRROR] TGUI interfaces to various smartfridges
|
2017-09-11 15:22:49 -05:00 |
|
LetterJay
|
6b25a0e42b
|
Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465
[MIRROR] Fixes shuttle name on ramming.
|
2017-09-11 15:22:36 -05:00 |
|
LetterJay
|
c46c442896
|
Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454
[MIRROR] Gets rid of manual overlay manipulation
|
2017-09-11 15:21:43 -05:00 |
|
AnturK
|
1553e26fe2
|
I missed that in last fix. (#30590)
|
2017-09-11 14:37:22 -05:00 |
|
LetterJay
|
726b86f3a4
|
Update on_move.dm
|
2017-09-11 14:18:28 -05:00 |
|
LetterJay
|
14aefe2e64
|
commit
|
2017-09-11 14:01:42 -05:00 |
|
LetterJay
|
2f10e78ba7
|
Update on_move.dm
|
2017-09-11 13:56:28 -05:00 |
|
LetterJay
|
01a5e4bddf
|
Merge pull request #2600 from Citadel-Station-13/Lisp
disables the lisp that lizard tongues have
|
2017-09-11 13:16:15 -05:00 |
|
LetterJay
|
532d8bd0a6
|
Merge pull request #2558 from Citadel-Station-13/upstream-merge-30268
[MIRROR] Adds db connectivity check to jobban cache building
|
2017-09-11 13:12:38 -05:00 |
|
LetterJay
|
74a163db23
|
Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252
[MIRROR] Server tools versioning and fix to displayed testmerges
|
2017-09-11 13:12:10 -05:00 |
|
LetterJay
|
6951e39d13
|
Update apc.dm
|
2017-09-11 13:10:54 -05:00 |
|
LetterJay
|
c1872907b1
|
Update robot_modules.dm
|
2017-09-11 13:10:18 -05:00 |
|
LetterJay
|
ff17626ce7
|
Update death.dm
|
2017-09-11 13:09:30 -05:00 |
|
KorPhaeron
|
d05fdb0eb0
|
Makes the station Z level into a list instead of a single define
|
2017-09-11 12:40:35 -05:00 |
|
KorPhaeron
|
bdf08037ff
|
Magic Ladder
|
2017-09-11 12:39:16 -05:00 |
|
BeeSting12
|
9e83717c92
|
Spetsnaz Pyro Bundle Rebalance (#30564)
* im gay
* oops did a thing wrong
* wew
|
2017-09-11 12:32:58 -05:00 |
|