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
e2f9ec4f18
Merge pull request #2686 from Citadel-Station-13/upstream-merge-30538
...
[MIRROR] Uplink lock codes now pick from the phonetic alphabet global list
2017-09-11 18:54:53 -05:00
beed20c130
Update life.dm
2017-09-11 18:52:14 -05:00
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
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
5c42666355
Merge pull request #2707 from Citadel-Station-13/upstream-merge-30590
...
[MIRROR] Fixes Punpun (again)
2017-09-11 18:45:06 -05:00
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
bf5094cf19
Update nuclearbomb.dm
2017-09-11 18:40:30 -05:00
d9abc21a9a
Fixed changeling augmented eyesight ability ( #30592 )
...
* Fix changeling augmented eyesight
Fix not being able to toggle changeling augmented eyesight off again.
* Fix augmented eyesight
Fix changeling's augmented eyesight ability.
* Fix changeling augmented vision
Fix changeling augmented vision, for real this time. Makes it properly grant night vision on purchase, remove granted effects on refund, and properly toggle on and off. Note, this changes it to x-ray vision, to replicate the way it has been working for well over a year.
2017-09-11 18:38:16 -05:00
e5cc2c1e4e
Update one_click_antag.dm
2017-09-11 18:28:09 -05:00
c03fb31b1c
Update sql_message_system.dm
2017-09-11 18:27:47 -05:00
5fafa90538
Update secrets.dm
2017-09-11 18:27:20 -05:00
584bb8dc64
Update holder2.dm
2017-09-11 18:27:04 -05:00
15c4d34b55
Update create_turf.dm
2017-09-11 18:26:50 -05:00
98f6cf208b
Update create_object.dm
2017-09-11 18:26:36 -05:00
bb463cef48
Update create_mob.dm
2017-09-11 18:26:13 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
e6cc0673aa
Merge branch 'master' into upstream-merge-30399
2017-09-11 18:07:15 -05:00
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
935ae98f4a
Merge branch 'master' into upstream-merge-29839
2017-09-11 18:03:51 -05:00
bfe633540a
Update human_movement.dm
2017-09-11 17:55:35 -05:00
914cc38a2d
Merge pull request #2676 from Citadel-Station-13/upstream-merge-30515
...
[MIRROR] Added warnings for ultrasafe and safe security modes
2017-09-11 17:54:18 -05:00
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
578846ba4b
Merge branch 'master' into upstream-merge-30519
2017-09-11 17:53:13 -05:00
c3a1c08206
Update smartfridge.dm
2017-09-11 17:51:49 -05:00
b5c007ffdf
Update vending.dm
2017-09-11 17:50:56 -05:00
74588305ce
Update vending_items.dm
2017-09-11 17:50:49 -05:00
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
ea82bf9bfa
Update suit_storage_unit.dm
2017-09-11 17:47:48 -05:00
9adcc174b3
Update shuttle.dm
2017-09-11 17:09:44 -05:00
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -05:00
9e73d297cc
Update security_levels.dm
2017-09-11 15:58:47 -05:00
97b25bc59a
Update vent_clog.dm
2017-09-11 15:58:12 -05:00
fe3d825596
Update spider_infestation.dm
2017-09-11 15:57:45 -05:00
12f17ecbe7
Update radiation_storm.dm
2017-09-11 15:57:15 -05:00
57343fa712
Update immovable_rod.dm
2017-09-11 15:56:25 -05:00
240c5bdaad
Update game_mode.dm
2017-09-11 15:55:27 -05:00
59772e2afd
Update events.dm
2017-09-11 15:54:55 -05:00
16912124e5
Update ritual.dm
2017-09-11 15:54:38 -05:00
1f7db947e4
Update teleport.dm
2017-09-11 15:54:01 -05:00
c7ae892e8d
Update persistence.dm
2017-09-11 15:53:35 -05:00
496b5d17c2
Update mapping.dm
2017-09-11 15:52:58 -05:00
e767e20574
Update game_mode.dm
2017-09-11 15:49:54 -05:00
9bb9aaa17d
Update events.dm
2017-09-11 15:48:59 -05:00
6b671ffd06
Update ritual.dm
2017-09-11 15:48:24 -05:00
f6f456068f
Update teleport.dm
2017-09-11 15:47:48 -05:00
e0e552829c
Update persistence.dm
2017-09-11 15:47:18 -05:00
c6c34b07be
Update mapping.dm
2017-09-11 15:46:45 -05:00
05efdd9ad3
Update sm_monitor.dm
2017-09-11 15:45:34 -05:00
804a59ad49
Update aux_base.dm
2017-09-11 15:45:11 -05:00
LetterJay