kevinz000
8f60d01208
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
2020-01-20 22:47:21 -07:00
r4d6
f6fef84984
Make the RCD effect not right-clickable.
2020-01-07 11:23:25 -05:00
kevinz000
07885a399a
Update muzzle.dm
2020-01-05 15:04:13 -08:00
kevinz000
6e1e1aac3e
Update impact.dm
2020-01-05 15:03:42 -08:00
kevinz000
eea8d353b6
Update tracer.dm
2020-01-05 15:03:14 -08:00
r4d6
37d50e2aaf
Add RCD effects
...
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
2020-01-03 02:13:20 -05:00
Linzolle
70e50e57cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-17 20:21:49 -06:00
BlackMajor
4b177c4956
Adjusted NF balance
2019-12-16 01:20:14 +13:00
BlackMajor
59d0376985
finished
2019-12-14 17:31:26 +13:00
Ghommie
723690bab0
Demodularize defib disks and projectiles icons.
2019-12-06 23:07:50 +01:00
Linzolle
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Linzolle
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
Linzolle
9250b1c103
big uppdate season
2019-10-23 21:08:47 -05:00
GrayRachnid
9f8ad74bf9
New traumas and some other things.
2019-10-08 03:53:01 -04:00
Poojawa
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
Poojawa
a772f532c3
Synthetic and RNG blood
2019-04-16 04:28:04 -05:00
Poojawa
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
kevinz000
5ccda57266
Update wormhole.dm
2018-07-24 01:06:37 -07:00
kevinz000
6e03770b93
Wormhole Update
2018-07-21 01:07:21 -07:00
kevinz000
b33d2b82fb
Merge branch 'master' into mirror-38933
2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40
Upstream mirror
2018-07-14 15:24:35 -07:00
deathride58
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
Jordan Brown
876e8ec713
Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors
...
Set cult floor effects to be on the floor plane
2018-06-01 09:50:58 -05:00
Poojawa
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
LetterJay
0381491643
oops
2017-12-27 07:08:26 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
deathride58
216b0931d1
Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
...
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
Ashe Higgs
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
nicbn
46c62b6293
overhaul ( #32316 )
2017-11-03 23:40:27 -05:00
nicbn
921b65ced0
Bullet decals tweak ( #31420 )
...
* wee
* screen clock update
* resist and stop pulling
* Whoop, Joan messed up on the selection border so here's some fixed icons for that
* there we go
* Update walls.dm
* Update walls.dm
* Update walls.dm
2017-10-13 09:47:10 -05:00
oranges
baa53ba1d3
Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA
...
Makes mobs on fire light up
2017-10-03 18:14:10 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
772299445e
Makes the Ark of the Clockwork Justicar much more fancy
2017-08-20 19:55:15 -05:00
CitadelStationBot
fb86e03544
Belligerent now has a visible indicator
2017-08-08 09:05:54 -05:00
CitadelStationBot
8ca4b9d614
Clockcult Combat Rebalance + Conversion Rework ( #2020 )
...
* Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures
* Update tips.txt
* no one cares
* manual clockcult syn
2017-08-04 11:46:22 -07:00
CitadelStationBot
d16f68b4da
Sigils of Transmission can now drain power, but Interdiction Lenses have been removed ( #2173 )
2017-07-28 23:52:02 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
a101497539
Warp cubes are slightly less instant but way cooler
2017-07-06 20:12:38 -05: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
LetterJay
1054100178
Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108
...
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
2017-07-03 17:46:37 -05:00
