CitadelStationBot
fd64d4fdfa
[MIRROR] Fixes IRC ahelp answer notifications ( #2888 )
...
* Merge pull request #30912 from tgstation/Cyberboss-patch-4
Fixes IRC ahelp answer notifications
* Fixes IRC ahelp answer notifications
2017-09-22 04:45:24 -05:00
LetterJay
8c6c57ff32
Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
...
[MIRROR] Removes old debug text
2017-09-22 00:03:30 -04:00
Poojawa
b7739d1c77
Update hostile.dm
2017-09-21 15:40:04 -05:00
kevinz000
344cd67181
flashbangs no longer damage blob tiles
2017-09-21 15:09:16 -05:00
LetterJay
dd7189618f
Merge pull request #2873 from Citadel-Station-13/upstream-merge-30768
...
[MIRROR] Adds back required arrivals undockedness with a config
2017-09-21 07:37:04 -04:00
LetterJay
fcb907d2ce
Merge pull request #2872 from Citadel-Station-13/upstream-merge-30802
...
[MIRROR] Stamina regen light
2017-09-21 07:36:45 -04:00
LetterJay
36cdee9f1c
Merge pull request #2871 from Citadel-Station-13/upstream-merge-30848
...
[MIRROR] VV Href Fixes
2017-09-21 07:35:24 -04:00
LetterJay
e154c27a72
Update circulator.dm
2017-09-21 06:35:01 -05:00
LetterJay
c1a3dc1c1e
Update cameranet.dm
2017-09-21 06:33:36 -05:00
LetterJay
afa1ef069c
Merge pull request #2884 from Citadel-Station-13/upstream-merge-30891
...
[MIRROR] Fixes banning panel href errors, adds href helper functions
2017-09-21 07:32:42 -04:00
LetterJay
3f7110d339
Merge pull request #2882 from deathride58/arousalruntimefix
...
Fixes a runtime in mind.dm
2017-09-21 07:32:23 -04:00
LetterJay
e05b24483c
Merge pull request #2879 from Citadel-Station-13/upstream-merge-30871
...
[MIRROR] Fix: No more beating sounds from dead hearts
2017-09-21 07:32:04 -04:00
LetterJay
ee7f3f748f
Merge pull request #2877 from Citadel-Station-13/upstream-merge-30841
...
[MIRROR] Buffs Magillitis
2017-09-21 07:31:44 -04:00
LetterJay
7c3845b779
Merge pull request #2870 from Citadel-Station-13/upstream-merge-30876
...
[MIRROR] Traitorbro fixes
2017-09-21 07:31:07 -04:00
oranges
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
Poojawa
aec48daa0a
Ashdrake noms ( #2868 )
...
* Initial commit
* probably a better way to check this
* It compiled boys. Let's see if it works.
* IT WAS ALL NULLS, BOYS
* Hooray, it's not broken anymore boys!
* Well it works, but we need transfer IDs to work
locating them post-initialize would help, probably. Then assigning their
links soon after.
* Bellies linked, autotransfer, LoseTarget
* half-thought sanity check needs to go away
* A few last minute tweaks.
2017-09-21 06:29:08 -05:00
oranges
9788c425be
Merge pull request #30891 from vuonojenmustaturska/adminhref
...
Fixes banning panel href errors, adds href helper functions
2017-09-21 06:28:55 -05:00
LetterJay
5b38d23bfd
oops
2017-09-21 02:28:37 -05:00
deathride58
160246396e
spacesuit objective rebrand
2017-09-21 00:57:51 -04:00
deathride58
b55ad7383e
i give up
2017-09-21 00:14:03 -04:00
deathride58
0d653c9f44
im unrobust
2017-09-20 22:39:58 -04:00
deathride58
860fe663b5
axes runtime's unstoppable horniness
2017-09-20 22:20:44 -04:00
deathride58
4473b24180
work dammit
2017-09-20 21:58:42 -04:00
deathride58
fb7f2d0ab8
fixes all the roundstart related issues
2017-09-20 16:03:56 -04:00
Robustin
e9534fb156
Fix: No more beating sounds from dead hearts ( #30871 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Removes beating from nonbeating hearts
* single check
2017-09-20 10:58:55 -05:00
ShizCalev
f5f9ada39c
Makes magillitis affect all Hominidae. ( #30841 )
2017-09-20 09:06:02 -05:00
LetterJay
bb837fe20e
donation item
2017-09-20 04:57:57 -05:00
oranges
9ee60af5e8
Merge pull request #30768 from Cyberboss/BringingSexyBack
...
Adds back required arrivals undockedness with a config
2017-09-20 03:55:14 -05:00
oranges
51b8f45345
Merge pull request #30802 from CPTANT/Stamina_regen_2
...
Stamina regen light
2017-09-20 03:52:59 -05:00
oranges
ef867206bb
Merge pull request #30848 from tgstation/Cyberboss-patch-2
...
VV Href Fixes
2017-09-20 03:50:47 -05:00
pubby
dae93856f5
Traitorbro fixes
2017-09-20 03:48:33 -05:00
CitadelStationBot
accd92a676
[MIRROR] Fixes mode conversion runtime ( #2855 )
...
* Fixes mode conversion runtime (#30857 )
* Fixes mode conversion runtime
2017-09-20 01:40:52 -05:00
Poojawa
6d717995a4
Update meteors.dm ( #2867 )
2017-09-20 01:40:09 -05:00
Poojawa
5b6be1bc44
wew, memes. ( #2869 )
2017-09-20 01:39:46 -05:00
CitadelStationBot
51786b346e
[MIRROR] Fixes it so Deadmin properly hides the Player Panel verb for admins. ( #2861 )
...
* Fixes it so Deadmin properly hides the Player Panel verb for admins.
* Update admin_verbs.dm
2017-09-20 01:04:13 -05:00
CitadelStationBot
6e79861679
[MIRROR] fix black box runtimes ( #2863 )
...
* fix black box runtimes
* fix black box runtimes
2017-09-20 01:03:17 -05:00
CitadelStationBot
84f108a68b
[MIRROR] Fix pipenets ( #2860 )
...
* Fix pipenets
* Fix pipenets
2017-09-20 01:02:33 -05:00
deathride58
f69ab93a2c
theres a proc for that
2017-09-19 23:31:08 -04:00
deathride58
ba05e177fd
ffs work already
2017-09-19 22:53:47 -04:00
deathride58
f2b63c1159
*foaming at mouth in far distance*
2017-09-19 22:33:00 -04:00
deathride58
2c528bb0e3
removes some of the more tide-y objectives, cleans comments
2017-09-19 21:11:25 -04:00
deathride58
5f65202cfd
added config option to enable or disable miscreants and crew objectives
2017-09-19 20:56:16 -04:00
deathride58
fac0e75103
blegh
2017-09-19 20:49:42 -04:00
deathride58
e0837a45b6
basic config stuff
2017-09-19 20:29:03 -04:00
deathride58
a8ad0e5aa5
Merge branch 'master' into screenshake
2017-09-20 00:08:25 +00:00
Poojawa
4ab7f126ed
Vore system updates ( #2864 )
...
* Tasting, digest/transfer chance, improvements
* more vague for defaults
* Actually let's hold off on silenced mode 'cuz broke
* make sure it's all commented out
* reverts vorepanel updater, buggy af. Adds mob vore
Ian can eat you now. \o/
2017-09-19 14:03:13 -05:00
LetterJay
b4e6519b51
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-09-19 12:32:31 -05:00
LetterJay
7c626edca4
fk u
2017-09-19 12:32:10 -05:00
LetterJay
50e9dd17b6
Merge pull request #2801 from Citadel-Station-13/upstream-merge-30745
...
[MIRROR] Dice will now roll when thrown
2017-09-19 12:20:34 -04:00
LetterJay
5f759c7c3f
Merge pull request #2858 from Citadel-Station-13/upstream-merge-30859
...
[MIRROR] Fixes safes not having adjacency checks
2017-09-19 12:19:59 -04:00