kevinz000
6fc746a5af
Merge pull request #9226 from Trilbyspaceclone/unmodular_2
...
Unmodulars a few things + new sprite + new welder tank(unused
2019-10-08 00:30:54 -07:00
TrilbySpaceClone
45a5b4974d
Merge branch 'master' into unmodular_2
2019-09-21 06:21:06 -04:00
Fermi
40bac8c807
t
2019-09-19 14:44:12 +01:00
Fermi
d8e6f4247e
Traaavis
2019-09-19 13:40:44 +01:00
Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
TrilbySpaceClone
17f6304acf
hm
2019-09-11 06:54:50 -04:00
Poojawa
f2b343518b
Update captain.dm
2019-09-11 02:43:55 -05:00
Poojawa
c13d8678b8
Update bartender.dm
2019-09-11 02:33:50 -05:00
Poojawa
3e72e13174
double checked
2019-09-11 02:33:32 -05:00
Poojawa
b01f135d3a
addresses a few concerns
2019-08-24 19:09:56 -05:00
Poojawa
8ad705ec74
Update curator.dm
2019-08-19 02:16:30 -05:00
Poojawa
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
Poojawa
43541b043d
Update warden.dm
2019-08-18 21:27:00 -05:00
Poojawa
70e3964fd2
Update head_of_security.dm
2019-08-18 21:22:10 -05:00
Code-Cygnet
c8810be706
Update captain.dm
2019-08-18 22:15:52 -04:00
Code-Cygnet
32695f28cf
Merge branch 'master' into The-Art-of-Drunken-Captaining
2019-08-18 22:12:23 -04:00
Code-Cygnet
a351d8f995
Update captain.dm
...
Attempted error fix.
2019-08-18 21:34:31 -04:00
Poojawa
9cbd8af5b9
Updates colors, fixes alignment issues.
2019-08-18 14:38:10 -05:00
Poojawa
c4198296d0
and this too
2019-08-18 04:26:30 -05:00
Poojawa
5e03f5be3d
Update shaft_miner.dm
2019-08-18 04:24:48 -05:00
Poojawa
b5da43c1b7
Gives Sec Officers back their stun combat weapons
2019-08-18 04:04:05 -05:00
Poojawa
933db4d05f
reverts the overly greyish colors back to vibrant ones
2019-08-18 01:00:16 -05:00
Poojawa
b5842048b4
blacklisting quirks
2019-08-17 23:42:01 -05:00
Poojawa
2922f08ef6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-17 23:41:28 -05:00
BlackMajor
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
Code-Cygnet
d2760287e1
Update captain.dm
...
Adds mind trait at line 24
2019-08-17 19:27:11 -04:00
Poojawa
a3cd143131
whaccky github hijinks
2019-08-10 19:28:47 -05:00
Poojawa
57835e2f81
head announce datums
2019-08-10 19:20:05 -05:00
Poojawa
d496e16dde
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 19:14:41 -05:00
Thalpy
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
kevinz000
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
Poojawa
1893a8f319
correctly copy/pasta's the chaplain stuff
2019-08-01 11:14:50 -05:00
Poojawa
218cbe2dbc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-31 19:09:35 -05:00
Fermi
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
kevinz000
2c3e46bbb9
Merge pull request #8982 from Ghommie/Ghommie-cit160
...
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-29 04:37:36 -07:00
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Ghommie
0a560b171c
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-27 13:01:27 +02:00
Poojawa
fe148a9f7b
Delete civilian.dm
2019-07-26 17:37:46 -05:00
Poojawa
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
kevinz000
175b69e868
headmins have decided
2019-07-25 23:18:31 -07:00
Sishen
1a92134ad3
b
2019-07-25 21:43:02 -04:00
kevinz000
d976dd016a
Merge remote-tracking branch 'origin/master' into trait_blacklisting
2019-07-25 15:20:46 -07:00
Ghommie
ee32e1680f
Ports "Replaces radio channel names and keys with defines"
2019-07-17 00:52:41 +02:00
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
kevinz000
da8b43f054
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
...
Makes Clowns and HonkMother Chaplins smile!
2019-07-14 14:11:09 -07:00
kevinz000
30a006e42f
additions, and it now nulls out.
2019-07-08 18:21:04 -07:00
kevinz000
270cdb1c43
CE memes
2019-07-08 12:35:21 -07:00
kevinz000
adf2166c57
t
2019-07-08 12:31:15 -07:00
Poojawa
899c5fed7e
Oh this should be uncommented too.
2019-07-04 00:56:17 -05:00
