891afed687
hoh
2020-08-07 06:27:49 -07:00
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
0d55a387d0
Powers Remembered: Chants ( #12403 )
...
* Initial Commit: Inath-Neq's Mantra
* A Volt of Inspiration
* Bug Squash I
* Bugsquashing II
* Bugsquashing III - Now with effects added!
* Bugsquashing IV: This probably won't work!
* It worked, how about that. Numbers Tweak.
* Better Number Tweaks
Co-authored-by: The0bserver <Gizmomaster777@gmail.com >
2020-06-02 15:27:13 -07:00
17826fe98b
monstermos wow
2020-05-11 22:00:04 -07:00
4eaa3a22c2
fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging ( #11528 )
...
* wew
* ah
* k
* k
* faster
2020-03-21 02:45:34 +01:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
8f60d01208
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
2020-01-20 22:47:21 -07:00
f6fef84984
Make the RCD effect not right-clickable.
2020-01-07 11:23:25 -05:00
07885a399a
Update muzzle.dm
2020-01-05 15:04:13 -08:00
6e1e1aac3e
Update impact.dm
2020-01-05 15:03:42 -08:00
eea8d353b6
Update tracer.dm
2020-01-05 15:03:14 -08:00
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
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
4b177c4956
Adjusted NF balance
2019-12-16 01:20:14 +13:00
59d0376985
finished
2019-12-14 17:31:26 +13:00
723690bab0
Demodularize defib disks and projectiles icons.
2019-12-06 23:07:50 +01:00
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
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
9250b1c103
big uppdate season
2019-10-23 21:08:47 -05:00
9f8ad74bf9
New traumas and some other things.
2019-10-08 03:53:01 -04:00
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
a772f532c3
Synthetic and RNG blood
2019-04-16 04:28:04 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
5ccda57266
Update wormhole.dm
2018-07-24 01:06:37 -07:00
6e03770b93
Wormhole Update
2018-07-21 01:07:21 -07:00
b33d2b82fb
Merge branch 'master' into mirror-38933
2018-07-14 15:26:49 -07:00
bcb1b04c40
Upstream mirror
2018-07-14 15:24:35 -07:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
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
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
0381491643
oops
2017-12-27 07:08:26 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
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
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
46c62b6293
overhaul ( #32316 )
2017-11-03 23:40:27 -05:00
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
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
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
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
772299445e
Makes the Ark of the Clockwork Justicar much more fancy
2017-08-20 19:55:15 -05:00
fb86e03544
Belligerent now has a visible indicator
2017-08-08 09:05:54 -05:00
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
d16f68b4da
Sigils of Transmission can now drain power, but Interdiction Lenses have been removed ( #2173 )
2017-07-28 23:52:02 -07:00
silicons