17a522300c
Update hardsuit.dm
2019-08-18 20:05:42 -07:00
f130bfe32e
Merge branch 'job-menu-improvements' of https://github.com/Poojawa/Citadel-Station-13-portworks into job-menu-improvements
2019-08-18 21:27:03 -05:00
43541b043d
Update warden.dm
2019-08-18 21:27:00 -05:00
70e3964fd2
Update head_of_security.dm
2019-08-18 21:22:10 -05:00
c8810be706
Update captain.dm
2019-08-18 22:15:52 -04:00
5840284e9e
Update alcohol_reagents.dm
...
Edited a typo at line 2144.
2019-08-18 22:14:41 -04:00
32695f28cf
Merge branch 'master' into The-Art-of-Drunken-Captaining
2019-08-18 22:12:23 -04:00
a351d8f995
Update captain.dm
...
Attempted error fix.
2019-08-18 21:34:31 -04:00
323073f8d4
Merge pull request #6 from Trilbyspaceclone/patch-213
...
Patch 213
2019-08-19 11:12:50 +10:00
9cbd8af5b9
Updates colors, fixes alignment issues.
2019-08-18 14:38:10 -05:00
2c000636dd
Update hardsuit.dm
2019-08-18 07:24:58 -07:00
5d33321f80
Merge remote-tracking branch 'refs/remotes/origin/job-pref-jonks' into job-menu-improvements
2019-08-18 07:46:00 -05:00
867b112158
HOW DID THIS NOT GET UPDATED????
2019-08-18 07:44:46 -05:00
c4198296d0
and this too
2019-08-18 04:26:30 -05:00
5e03f5be3d
Update shaft_miner.dm
2019-08-18 04:24:48 -05:00
b5da43c1b7
Gives Sec Officers back their stun combat weapons
2019-08-18 04:04:05 -05:00
933db4d05f
reverts the overly greyish colors back to vibrant ones
2019-08-18 01:00:16 -05:00
e1cee15720
seed
2019-08-18 01:40:36 -04:00
566a4e65a1
right crafting
2019-08-18 01:31:38 -04:00
8214a7012f
I Didnt save the two corrections
2019-08-18 01:17:34 -04:00
fc6633071a
rwar!
2019-08-18 01:07:38 -04:00
4dae36869c
tada
2019-08-18 01:01:00 -04:00
b5842048b4
blacklisting quirks
2019-08-17 23:42:01 -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
2b08b97f1d
yay
2019-08-17 23:54:50 -04:00
13f27c040e
Merge pull request #8848 from Citadel-Station-13/trait_blacklisting
...
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
2019-08-18 15:33:08 +12:00
43b1d0405e
Update flowers.dm
2019-08-17 23:25:38 -04:00
bb9aa4f039
I woulder how much this will fuck everthing up
2019-08-17 22:49:06 -04:00
cfd8217947
Update flowers.dm
2019-08-17 22:10:23 -04:00
e69d27f9eb
Traitor armor
2019-08-17 20:36:47 -04:00
975a33aad7
Update alcohol_reagents.dm
...
Adds commander and chief, starting at line 2125 and ending at 2146.. hopefully.
2019-08-17 19:38:58 -04:00
d2760287e1
Update captain.dm
...
Adds mind trait at line 24
2019-08-17 19:27:11 -04:00
5746126794
since it conflicted there, let's just fix it here
2019-08-17 05:43:24 -05:00
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
725a8046e1
just need items to actually have their overlays, ree
2019-08-17 04:50:24 -05:00
ff58fec243
New plant type: Peaches
...
Botanists can now grow peaches from a new pack of seeds!
2019-08-17 02:50:56 -05:00
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
4b6b2cf195
Adds new drink to drink recipes
...
It's a drink for Captains
2019-08-17 01:37:28 -04:00
bcf65dc901
Update drink_reagents.dm
2019-08-17 00:58:02 -04:00
3851739533
Update other_reagents.dm
2019-08-17 00:06:58 -04:00
c81fd8fcd4
Update drink_reagents.dm
2019-08-17 00:02:22 -04:00
5225665516
kev fix
2019-08-16 23:48:41 -04:00
7ddfff7f5c
Update uplink_items.dm
2019-08-16 23:07:15 -04:00
20d71d1196
Fixes warp whistle runtimes for real this time.
2019-08-16 22:19:37 -04:00
d93fceec98
oops recipe time thanks pax
2019-08-17 12:15:17 +10:00
e838da8039
Merge pull request #3 from Citadel-Station-13/master
...
3
2019-08-17 11:55:56 +10:00
c2dd7111d0
Merge pull request #9112 from Trilbyspaceclone/patch-209
...
Heyyyy lets make sure the strawberry seeds are in the vender and spelled correctly
2019-08-16 17:17:04 -07:00
f26718aab2
Merge pull request #9138 from kappa-sama/canefix
...
re-adds sugarcane seeds to megaseed vendors
2019-08-16 17:14:28 -07:00
9071917e72
Merge pull request #9088 from Poojawa/blurry-runtimes
...
Fixes some runtimes and removes a holodeck exploit
2019-08-16 17:05:21 -07:00
f9eb85c3c1
Merge pull request #9130 from Owai-Seek/ServiceStuff
...
Service QoL
2019-08-16 17:03:11 -07:00
kevinz000