deathride58
d21260d480
Makes arousal meter invisible when arousal is disabled ( #2028 )
...
* makes arousal meter invisible when arousal is disabled
* sets the appearance of the arousal meter when the hud is generated
* hm
* hopefully fixed
* cmon
* okay NOW it works. it 100% works
2017-07-17 22:50:52 -07:00
CitadelStationBot
62180f8953
ClickCross now uses CanPass instead of density directly. ( #2016 )
2017-07-15 11:44:36 -07:00
kevinz000
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
CitadelStationBot
7c4b887551
Clockwork component icons for tgui will only be generated once ( #1995 )
2017-07-14 03:21:13 -07:00
CitadelStationBot
4796ede787
Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 10:15:09 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
kevinz000
6e2bd5fef5
Update click.dm
2017-07-03 15:45:19 -07:00
CitadelStationBot
72e7632fa8
[s] Fixes TK remote grab exploit
2017-06-25 07:41:23 -05:00
LetterJay
f668021230
commit
2017-06-19 17:33:40 -05:00
LetterJay
9332353714
update
2017-06-19 17:31:00 -05:00
LetterJay
866a569e41
dmi to png
2017-06-19 17:28:06 -05:00
LetterJay
12055144e4
fix it
2017-06-19 16:09:16 -05:00
LetterJay
c1af381233
Merge pull request #1460 from Citadel-Station-13/upstream-merge-28142
...
[MIRROR] Adds another parallax layer
2017-06-14 08:55:44 -05:00
LetterJay
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBot
97005222ff
Blood Cult Nerf: Restricted Nar-Sie summoning locations ( #1479 )
2017-06-13 13:48:49 -07:00
CitadelStationBot
811a25a3bb
Makes game world plane use client color
2017-06-13 07:13:39 -05:00
LetterJay
87ce1e1780
upstream-merge-28047
2017-06-11 08:39:38 -05:00
LetterJay
f5f4e3a9d1
upstream-merge-28047
2017-06-11 08:26:09 -05:00
LetterJay
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
CitadelStationBot
cb15acf8b2
Adds another parallax layer
2017-06-07 14:18:39 -05:00
CitadelStationBot
4cc3f81b3e
Moves attack chain proc from global to obj/item
2017-05-26 11:12:09 -05:00
LetterJay
34f82efdd7
mind over matter
2017-05-24 08:30:23 -05:00
LetterJay
fe9c47650f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27495
2017-05-24 08:26:40 -05:00
LetterJay
34e74a377e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442
2017-05-24 08:06:53 -05:00
LetterJay
e34bed049f
Merge branch 'master' into upstream-merge-27495
2017-05-24 08:00:10 -05:00
LetterJay
a80a00bc6e
Merge branch 'master' into upstream-merge-27324
2017-05-23 07:17:45 -05:00
LetterJay
b633ef0991
Merge pull request #1130 from Citadel-Station-13/GangSync
...
Syncs all gang related PRs with upstream
2017-05-23 06:17:29 -05:00
LetterJay
b85d2ea321
Syncs all gang related PRs with upstream
2017-05-23 06:10:40 -05:00
LetterJay
d6a11b2aa2
click.dm
2017-05-23 05:19:57 -05:00
LetterJay
bb51ed94ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27515
2017-05-23 05:17:39 -05:00
LetterJay
9df8057e0e
Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344
...
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-22 12:40:18 -05:00
CitadelStationBot
4533d31e34
Cult Fixes for Construct Icons and Spells
2017-05-22 10:49:33 -05:00
CitadelStationBot
070ee9b86a
Fixes shooting out of view windows
2017-05-22 07:44:10 -05:00
CitadelStationBot
25df88509a
Reorganizes martial arts and stores them in the MIND.
2017-05-22 07:13:10 -05:00
CitadelStationBot
1989e3d5ea
properly fixes quickgrab exploit
2017-05-21 22:27:54 -05:00
Poojawa
186ed2acbb
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
2017-05-21 00:44:08 -05:00
Poojawa
45ba084c6a
Merge branch 'master' into upstream-merge-27344
2017-05-20 23:26:28 -05:00
CitadelStationBot
88ede32216
[MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition ( #994 )
...
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition
* Rej cleanup
* update mob.dmi
* Update living_defense.dm
2017-05-20 23:00:02 -05:00
CitadelStationBot
06c0856799
Fixes buttons under doors.
2017-05-20 11:34:52 -05:00
CitadelStationBot
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
CitadelStationBot
c6a9bdb4b2
Fixes clicking things under windows/doors.
2017-05-18 16:37:50 -05:00
CitadelStationBot
e0a1c24367
Fixed TK butchering after item loses adjacency ( #1011 )
2017-05-18 12:33:27 -05:00
CitadelStationBot
8bcaa54cbe
[MIRROR] Fixes language code ignoring holder restrictions ( #858 )
...
* Fixes language code ignoring holder restrictions
* resolve .rej file.
2017-05-18 04:13:57 -05:00
CitadelStationBot
626959d96e
[MIRROR] Fixes a bunch more cult bugs ( #853 )
...
* Fixes a bunch more cult bugs
* Resolves .rejs and icons
2017-05-18 03:21:07 -05:00
CitadelStationBot
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
bdbedd33f4
Merge branch 'master' into upstream-merge-26776
2017-05-17 05:14:18 -04:00
LetterJay
45c283a935
applies the previous fixes for cult on a closed PR
2017-05-16 22:59:41 -05:00
LetterJay
4710beca0e
Merge pull request #807 from Citadel-Station-13/upstream-merge-26631
...
[MIRROR] 2017 Cult Overhaul P1: Cult Master and Datum Cult
2017-05-16 17:13:30 -04:00
LetterJay
6c4a355379
Merge pull request #850 from Citadel-Station-13/upstream-merge-26980
...
[MIRROR] Small Click refactor.
2017-05-14 16:40:30 -04:00
