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
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
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
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
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
b671384015
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-15 08:23:48 -05:00
a971390cff
Merge pull request #8992 from jakeramsay007/Helmet-Internals
...
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -05:00
d496e16dde
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 19:14:41 -05:00
eb9e6a041d
Ghommie's fix.
2019-08-09 12:17:54 +01:00
dc66446064
dab dab
2019-08-09 03:19:02 -04:00
4ba3d851ed
IT JUST WORKS
2019-08-09 00:46:14 -04:00
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -05:00
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
2e71074f30
compile
2019-08-07 13:22:25 -07:00
65473dc4ba
s
2019-08-07 13:18:45 -07:00
277971971f
s
2019-08-07 13:07:38 -07:00
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
a845b5ae0c
Merge pull request #8986 from Ghommie/Ghommie-cit163
...
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
2019-08-07 00:49:23 -07:00
53e9c140cf
Merge pull request #22 from Citadel-Station-13/master
...
YARR
2019-08-06 16:08:16 +01:00
eab07c62de
Merge pull request #9045 from CameronWoof/codifying-mrp-again
...
Officially ends the non-stop thrill ride of coating the station in your gender fluids for "fun"
2019-08-05 14:57:54 -07:00
33d883367a
makes fluid_rate match the intended rate
2019-08-05 06:41:57 -07:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
f1c9a07f6d
Merge pull request #8912 from Ghommie/Ghommie-cit146
...
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
de675a10e7
Merge pull request #9025 from Poojawa/patch-1
...
Actually fixes Vore sounds for real this time
2019-08-04 19:08:16 -07:00
27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
Fermi