460820b245
Update safe.dm
2017-09-12 03:05:46 -05:00
59319b6bea
Update taperecorder.dm
2017-09-12 03:04:56 -05:00
a549f3128a
Update atmos_control.dm
2017-09-12 03:02:15 -05:00
deca859284
Update atmos_alert.dm
2017-09-12 03:00:11 -05:00
505925d767
Update atmos_alert.dm
2017-09-12 02:59:58 -05:00
4cd4c6df70
Merge pull request #2697 from Citadel-Station-13/upstream-merge-30574
...
[MIRROR] Adds a few SDQL2 list wrappers
2017-09-12 02:41:30 -05:00
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
8223692c32
Merge pull request #2684 from Citadel-Station-13/upstream-merge-30558
...
[MIRROR] Adds href tokens to topic.dm
2017-09-12 02:37:49 -05:00
4fdc313486
Update topic.dm
2017-09-12 02:36:28 -05:00
01b0e754c2
Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
...
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -05:00
b8f2fe00e5
Update topic.dm
2017-09-12 02:31:25 -05:00
caca1d1794
Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553
...
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-12 01:22:11 -05:00
a5a8f8faba
Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530
...
[MIRROR] Adds Gondoland and the rare Gondolas
2017-09-12 01:21:09 -05:00
4d7c4e6da9
Merge branch 'master' into upstream-merge-30554
2017-09-12 01:20:05 -05:00
7deeac86eb
Merge pull request #2670 from Citadel-Station-13/upstream-merge-29839
...
[MIRROR] [s] Adds a security token to all admin hrefs
2017-09-12 01:17:56 -05:00
3e62306f0a
Merge pull request #2685 from Citadel-Station-13/upstream-merge-30580
...
[MIRROR] Fixes breathing from softcrit (hopefully)
2017-09-12 01:09:54 -05:00
fcbebe6423
Update life.dm
2017-09-12 01:03:11 -05:00
2ae18cd35e
Update life.dm
2017-09-12 00:52:07 -05:00
d045103744
Update life.dm
2017-09-12 00:48:22 -05:00
44aa6c6be6
Merge pull request #2689 from Citadel-Station-13/upstream-merge-30544
...
[MIRROR] Fixes lockers alt-click
2017-09-12 00:41:15 -05:00
1cea5d6e4b
Update one_click_antag.dm
2017-09-11 23:41:45 -05:00
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
0431fa3cb6
Merge branch 'master' into upstream-merge-30544
2017-09-11 23:21:00 -05:00
6c9609a7ee
Merge branch 'master' into upstream-merge-30580
2017-09-11 23:19:07 -05:00
cce196585b
addsssssssssssssssssssssssss hisssssssssssssssssssssssssssing back sssssssssssssssssssssssso people will ssssssssssssssssssssssstop bitching
2017-09-11 23:15:47 -05:00
c3ef612490
Ports MSO's fading note system
2017-09-11 23:07:30 -05:00
5822e04980
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-09-11 22:47:45 -05:00
39687189b6
donation
2017-09-11 22:47:27 -05:00
1d19ee6bbf
Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117
...
[MIRROR] Crew monitoring rework part 1: crew pinpointers
2017-09-11 22:41:24 -05:00
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
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
ce518ee45e
Update closets.dm
2017-09-11 18:56:10 -05:00
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
LetterJay