0ba79c0ad5
i ded (replaces justicecrew for non-lawyer sec with a more open objective)
2017-09-10 02:46:06 -04:00
3a30daa2ec
Merge pull request #2674 from Citadel-Station-13/upstream-merge-30520
...
[MIRROR] Fix Hearty Punch healing to include softcrit
2017-09-09 23:50:20 -05:00
8a297a3a9c
People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit
2017-09-09 21:07:34 -05:00
317958fb5c
Fixes more CanPass misuse ( #30493 )
...
* Fixes more CanPass misuse
* Let's not give wrong impression
* spans
2017-09-09 19:41:02 -05:00
eaeaae7bef
Added warnings for ultrasafe and safe security modes ( #30515 )
2017-09-09 19:39:52 -05:00
dc2c9fb07d
Fixes admin topics
2017-09-09 17:13:25 -05:00
3ceb70f84d
Fix crit-only healing to include softcrit ( #30520 )
...
With softcrit implemented, people are only unconcious in hard crit. This will no longer bring you out of crit as intended. This PR fixes that.
2017-09-09 16:29:36 -05:00
8e0ef4f38f
num2text the Instances number ( #30509 )
2017-09-09 14:24:24 -05:00
7baf203862
Merge pull request #2656 from Citadel-Station-13/upstream-merge-30457
...
[MIRROR] Adds Internet admin midi
2017-09-09 01:07:05 -05:00
41a3fd8467
Merge pull request #2672 from Citadel-Station-13/upstream-merge-30481
...
[MIRROR] Placing a robotics factory actually disables shunting
2017-09-09 01:05:54 -05:00
ba3f92fa17
Merge pull request #2671 from Citadel-Station-13/upstream-merge-30504
...
[MIRROR] Windoors open when emagged again
2017-09-09 01:05:30 -05:00
a3e5bfc496
Merge pull request #2669 from Citadel-Station-13/upstream-merge-30489
...
[MIRROR] Makes computers lose their light when their screens break
2017-09-09 01:05:09 -05:00
f47e4a8280
Merge pull request #2666 from Citadel-Station-13/upstream-merge-30498
...
[MIRROR] Golem shells can no longer fit in bags
2017-09-09 01:04:23 -05:00
5c4940c832
Merge pull request #2663 from Citadel-Station-13/upstream-merge-30389
...
[MIRROR] Adds a short telegraph to the watcher's blasts
2017-09-09 01:03:15 -05:00
5202705ed7
Merge pull request #2662 from Citadel-Station-13/upstream-merge-30487
...
[MIRROR] Adds shamebrero penguin for dumb alphonzo
2017-09-09 01:02:50 -05:00
780faec591
Merge pull request #2652 from Citadel-Station-13/upstream-merge-30202
...
[MIRROR] You can now drag things up and down ladders
2017-09-09 00:59:58 -05:00
5b61c84df4
Merge pull request #30481 from YPOQ/shuntfix
...
Placing a robotics factory actually disables shunting
2017-09-08 21:25:28 -05:00
d60a6729d3
Merge pull request #30504 from YPOQ/windooremagfix
...
Windoors open when emagged again
2017-09-08 21:22:16 -05:00
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
25a5325e24
Merge pull request #30489 from Cyberboss/CompLightFix
...
Makes computers lose their light when their screens break
2017-09-08 21:01:39 -05:00
d35717e1ab
[MIRROR] Fixes assault pod blinking docking effects ( #2667 )
...
* Fixes assault pod blinking docking effects (#30492 )
* Fixes assault pod blinking docking effects
2017-09-08 20:15:10 -05:00
c1078c2c3e
eugh
2017-09-08 17:56:42 -04:00
bed1f4d88e
gonna compile sooner or later
2017-09-08 17:27:57 -04:00
591a086a4f
.... apparently poly isn't a pet?
2017-09-08 17:17:59 -04:00
3852a246f8
byond cant handle ternaries
2017-09-08 16:47:42 -04:00
c852910714
there we go
2017-09-08 16:34:20 -04:00
547799c3ac
bluh
2017-09-08 16:26:33 -04:00
9116be1e53
Extra objectives for assistants, poly objective for CE
2017-09-08 16:20:40 -04:00
8010c44c72
Golem shells can no longer fit in bags ( #30498 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* RIP pocket army
* Delete AutoChangeLog-pr-30056.yml
2017-09-08 13:53:00 -05:00
2f438e5f4a
Adds a short telegraph to the watcher's blasts ( #30389 )
...
* Adds a telegraph to the watcher's blasts
* hmm
2017-09-08 10:18:41 -05:00
2ab29ccac4
Adds shamebrero penguin for dumb alphonzo ( #30487 )
2017-09-08 10:11:21 -05:00
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
0dfe72d77e
chainsaws rebalance, but working this time :)
2017-09-08 10:00:47 -05:00
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
00dd2f283b
Adds Internet admin midi ( #30457 )
...
* Adds Internet admin midi
* Moves global regex into proc (shell_url_scrub)
* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it
* Admins can stop playing web sounds
* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio
* Kills \n in web sound
* play_web_sound availability based on config
* play web sound and shelleo tweaks
istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc
* Security fix for play web sound
2017-09-08 09:32:29 -05:00
ce787e7726
Reverts sav file persistance for poly/pun-pun ( #2654 )
...
* Reverts sav file persistance for poly/pun-pun
* makes sure poly writes to poly
2017-09-08 06:58:08 -05:00
62225acc2b
Update verbs.dm
2017-09-08 06:56:31 -05:00
50cd75df7d
Actually makes Citadel reagents process ( #2653 )
2017-09-08 06:55:19 -05:00
a806ecad19
Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486
...
[MIRROR] Fixes goliath butchering
2017-09-07 15:57:03 -05:00
d5c4f6e62d
Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451
...
[MIRROR] Disablers and ions wont burn plasma statues statues
2017-09-07 15:55:04 -05:00
93a98c000b
Merge pull request #2648 from Citadel-Station-13/upstream-merge-30460
...
[MIRROR] You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
2017-09-07 15:54:49 -05:00
217e077342
Merge pull request #2645 from Citadel-Station-13/upstream-merge-30469
...
[MIRROR] Fixes containment field CanPass
2017-09-07 15:54:34 -05:00
82cfa67581
Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233
...
[MIRROR] Adds a message when trying to move while buckled
2017-09-07 15:53:38 -05:00
f8d149975f
engineering objectives, removes assistant petsplosion
2017-09-07 15:43:17 -04:00
b9bbd348df
You can now drag things up and down ladders ( #30202 )
...
* Can drag things up and down ladders
* Somehow left out this line
* Icon update, auto_connect
* Uses the proper pulling proc
2017-09-07 12:48:43 -05:00
ff219f365e
Update goliath.dm ( #30486 )
2017-09-07 11:58:42 -05:00
b172025e96
Disablers and ions wont burn statues
2017-09-07 10:34:44 -05:00
b6eddd8845
ok
2017-09-07 10:34:36 -05:00
c2c69d359f
Fixes shuttle name on ramming.
2017-09-07 10:34:28 -05:00
f4dbb6dc36
Fixes drone light toggle while dead
2017-09-07 10:34:20 -05:00
deathride58