Ghommie
|
49c8a08c15
|
Removes the ? that suppressed runtimes.
|
2019-07-07 20:39:40 +02:00 |
|
Ghommie
|
ef745a850d
|
Fixing lobby ghost roles for real.
|
2019-07-07 20:38:08 +02:00 |
|
kevinz000
|
e227d5575c
|
Merge pull request #8825 from Ghommie/Ghommie-cit110
Ports "Fixes default supplypods exploding their contents" & co.
|
2019-07-07 02:34:47 -07:00 |
|
kevinz000
|
91f114f717
|
Merge pull request #8832 from Ghommie/Ghommie-cit116
Fixes new player runtime that makes people unable to join rounds.
|
2019-07-07 02:33:32 -07:00 |
|
Ghommie
|
fa5e1947a4
|
pet peeve.
|
2019-07-07 01:17:41 +02:00 |
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
Ghommie
|
fe2abc990b
|
Fixes new player runtime that makes people unable to join rounds.
|
2019-07-06 04:51:56 +02:00 |
|
kevinz000
|
748550895d
|
Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
Ports traitor codeword highlighting
|
2019-07-05 06:57:49 -07:00 |
|
kevinz000
|
7544748570
|
Merge pull request #8790 from deathride58/pryablesleepers
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
|
2019-07-05 06:55:18 -07:00 |
|
Fermi
|
7fa072030b
|
Update to manage prefs. (and so it doesn't do it the wrong way round.)
|
2019-07-04 23:44:13 +01:00 |
|
Fermi
|
a915821d1a
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-04 23:24:39 +01:00 |
|
Fermi
|
ad37ec08b2
|
Removing slimejelly req from feedback.
|
2019-07-04 23:24:18 +01:00 |
|
Ghommie
|
eed30d73a9
|
Ports "Makes ventcrawl much easier on the client"
|
2019-07-04 23:28:14 +02:00 |
|
Ghommie
|
b41e289db3
|
Ports "Fixes default supplypods exploding their contents" & co.
|
2019-07-04 22:35:13 +02:00 |
|
Ghommie
|
f134d58464
|
Flak.
|
2019-07-04 21:37:06 +02:00 |
|
Ghommie
|
0361a0a863
|
Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
also "Makes Corgi collars removable"
|
2019-07-04 21:33:56 +02:00 |
|
Poojawa
|
f66ee6f967
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-07-04 00:44:29 -05:00 |
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01:00 |
|
Ghommie
|
a3ab5f6d23
|
Moving the snowflake mob var to the component and finalizing.
|
2019-07-04 02:03:51 +02:00 |
|
Ghommie
|
5799ff402f
|
Progress.
|
2019-07-03 22:51:10 +02:00 |
|
kevinz000
|
bce4ce31ab
|
Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-07-03 13:47:04 -07:00 |
|
kevinz000
|
75f1dca544
|
Merge pull request #8773 from Sishen1542/podgang
Podweak now have all customization options.
|
2019-07-03 13:46:08 -07:00 |
|
kevinz000
|
10a584c71f
|
Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-07-03 13:45:02 -07:00 |
|
Ghommie
|
adbf67b052
|
Purging old code,
forcing mind transfer on transform procs,
Fixing a slight fuck up null.ckey 👀
|
2019-07-03 20:01:49 +02:00 |
|
Ghommie
|
1fd50cc15a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96
|
2019-07-03 04:52:57 +02:00 |
|
Ghommie
|
ffecca8c11
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-03 03:24:28 +02:00 |
|
Ghommie
|
c58efa64c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-03 02:36:23 +02:00 |
|
Fermi
|
5f72277549
|
Succumb tweak. Ready to merge.
|
2019-07-02 23:24:35 +01:00 |
|
Fermi
|
381e12f04a
|
Fixing message_admins.
|
2019-07-02 22:52:45 +01:00 |
|
Fermi
|
27aad8f117
|
Quick in case.
|
2019-07-02 22:42:07 +01:00 |
|
Fermi
|
946fbff999
|
+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.
|
2019-07-02 22:15:32 +01:00 |
|
Fermi
|
d83fe49556
|
+lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo
|
2019-07-02 15:03:19 +01:00 |
|
Ghommie
|
33687dc2bc
|
I'm an idiot, I need to pick an element within the list, not the list itself!!
|
2019-07-01 22:53:42 +02:00 |
|
Ghommie
|
d0a001f663
|
Quickfixing latejoin ghost roles, I'm sorry.
|
2019-07-01 22:47:51 +02:00 |
|
deathride58
|
4b83110db7
|
fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck.
|
2019-06-30 05:02:51 -04:00 |
|
deathride58
|
1efd1b2634
|
oh, and lets add a length check real quick to make sure the sleeper actually has shit in it
|
2019-06-30 04:35:34 -04:00 |
|
deathride58
|
cb5ed2d2cd
|
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar
|
2019-06-30 04:29:48 -04:00 |
|
kevinz000
|
09c8a45fe2
|
Merge pull request #8770 from Arturlang/Carp_Deflecting
Carp now deflects the bullets instead of making them dissapear.
|
2019-06-29 20:08:47 -07:00 |
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
Ghommie
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02:00 |
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|
kevinz000
|
c495a2aa47
|
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
|
2019-06-28 20:32:15 -07:00 |
|
Ghommie
|
d93e63af53
|
we just want the trauma to be niche, not unachievable.
|
2019-06-28 23:21:10 +02:00 |
|
Ghommie
|
3291b9c47a
|
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-06-28 23:17:12 +02:00 |
|
deathride58
|
7e943c0f42
|
Merge pull request #8737 from Ghommie/Ghommie-cit85
Fixes CWC construct shells being visible as ghost role to latejoiners.
|
2019-06-28 16:03:53 -04:00 |
|
Sishen
|
1459ada045
|
adds customization options for podweak
|
2019-06-28 10:22:09 -04:00 |
|
Arturlang
|
442c21fdba
|
For the actual deflecting!
|
2019-06-28 11:41:01 +03:00 |
|
deathride58
|
3cd5b1d180
|
Merge pull request #8741 from Ghommie/Ghommie-cit88
ports "Stockings"
|
2019-06-28 00:38:27 -04:00 |
|
deathride58
|
2ed69c8b46
|
Merge pull request #8753 from Sishen1542/siliconmanbad
[PORT] Non-station AI can no longer interact off their z-level.
|
2019-06-28 00:29:32 -04:00 |
|
Ghommie
|
a90ef6faa3
|
and it's gone.
|
2019-06-27 15:06:04 +02:00 |
|