8aacedaefa
Merge pull request #9316 from Thalpy/Reagents_bitflats
...
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
2019-10-08 00:33:21 -07:00
f405cd1be3
Merge pull request #8937 from Ghommie/Ghommie-cit153
...
darkmode/lightmode fixes and tweaks.
2019-10-08 00:25:51 -07:00
dcb37bfd0e
Merge pull request #9418 from Ghommie/Ghommie-cit216
...
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
564c1fde9f
Merge branch 'master' into Reagents_bitflats
2019-10-08 07:31:03 +01:00
0073d99a22
Merge pull request #9309 from Thalpy/tg-Organ-port
...
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
27c2c89766
Merge branch 'master' into Reagents_bitflats
2019-10-05 23:43:19 +01:00
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
81fc0c1b32
more foolproofing.
2019-10-02 00:37:02 +02:00
250c6ed986
Merge pull request #9367 from Poojawa/totally-radical
...
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
0febc1977a
Merge pull request #9191 from Linzolle/fireman
...
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
888906b4e7
Fixes Mk1 !
2019-09-27 11:12:53 +01:00
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
3b1a36fb07
Needed.
2019-09-20 04:17:01 +01:00
74cc70ed72
Like this?
2019-09-20 03:16:26 +01:00
b8190552f1
Update defines, and vars, and created new procs
2019-09-19 21:24:50 +01:00
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
023428f6a4
port experimental dissection
2019-09-18 23:04:11 -05:00
8ad11d7250
ports ligament surgeries
2019-09-18 22:55:46 -05:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
f0afc9c490
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-13 12:59:15 -05:00
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
42613d1800
Merge pull request #9251 from Linzolle/chaplain-fashion-time
...
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
39b840b180
Merge pull request #9278 from deathride58/fuckkeydown
...
[s] ports tgstation/tgstation#46425
2019-09-12 12:10:01 -07:00
7e7527dcfe
Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY
...
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
2019-09-12 18:37:56 +12:00
4551b13547
[s] ports tgstation/tgstation#46425
2019-09-11 19:24:05 -04:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
cbf041663f
Fixing and testing themes.
2019-09-11 23:30:04 +02:00
5ab224e20a
tweak values
2019-09-11 11:34:27 -05:00
daba09582a
move to misc.dm
2019-09-11 10:18:10 -05:00
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
09ed526594
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
...
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -05:00
5b4347c5ab
Initial commit.
...
needs to be added alongside all med_hud_set_status and tested to even fukkin' work.
2019-08-27 04:30:31 -05:00
f07cdc0665
Merge pull request #9177 from JTGSZ/fix
...
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
2019-08-26 19:42:15 -07:00
b093439c73
aaaaaaaa
2019-08-25 16:27:02 -04:00
5e94a5db80
ports #44155 from /tg/station
2019-08-24 20:21:44 -05:00
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
9cbd8af5b9
Updates colors, fixes alignment issues.
2019-08-18 14:38:10 -05:00
2922f08ef6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-17 23:41:28 -05:00
1d0cb91aaf
Update traits.dm
...
Adds new mob trait at line 121
2019-08-17 19:02:30 -04:00
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
4c5eba6acb
t
2019-08-15 14:35:00 -07:00
cc86a84274
stuff
2019-08-15 14:30:48 -07:00
kevinz000