 ThalpyandGitHub
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
ThalpyandGitHub
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
Poojawa
|
43affcb831
|
properly fixes Quartermaster headrole, mind traits
|
2019-07-04 00:52:48 -05: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 |
|
|
ThalpyandGitHub
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01: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 |
|
|
Thalpy
|
937d6467e6
|
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
|
2019-06-30 19:16:27 +01:00 |
|
|
TrilbySpaceClone
|
688fabfffc
|
Honk
|
2019-06-29 21:03:38 -04:00 |
|
|
ThalpyandGitHub
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
|
Ghommie
|
3291b9c47a
|
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-06-28 23:17:12 +02:00 |
|
|
Ghommie
|
38bc8a4efd
|
Ports "Removes SSreligion"
|
2019-06-23 01:45:21 +02:00 |
|
|
Poojawa
|
762a3e3c02
|
Ports revised job backend from TG
|
2019-06-16 18:45:26 -05:00 |
|
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
|
Ghommie
|
0b53df47de
|
Enough clowning around.
|
2019-06-07 03:22:26 +02:00 |
|
|
Fermi
|
79a7b6b45b
|
Fixes.
|
2019-05-27 20:25:57 +01:00 |
|
|
Fermi
|
246a344fed
|
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
|
2019-05-16 00:58:30 +01:00 |
|
|
Poojawa
|
9374e83e7d
|
fixes armor plate oversight
|
2019-05-01 00:05:14 -05:00 |
|
|
deathride58
|
d243fc3214
|
Remove kebab's omegastation's jobs
|
2019-03-31 17:44:11 -04:00 |
|
|
deathride58
|
ee736864a0
|
fixes nameless captains making the announce message show up as "Captain Captain on deck!
|
2019-03-01 01:03:31 -05:00 |
|
|
deathride58
|
781a15c81e
|
adds the ability to mark your character as nameless
|
2019-02-21 06:19:43 -05:00 |
|
|
kevinz000
|
8812ef9ddd
|
exemption
|
2018-12-16 11:05:26 -08:00 |
|
|
deathride58andkevinz000
|
a9cc6b0509
|
fixes job exp requirements by unmodularizing job list defines (#7703)
|
2018-11-08 01:47:08 -08:00 |
|
|
nik707
|
33d2a20ef2
|
first nerf of Mining armor, F in chat
|
2018-10-04 21:37:26 -05:00 |
|
|
deathride58andGitHub
|
c6874eccff
|
Merge pull request #7569 from Tupinambis/HoSTelebaton
The HoS starts with a telebaton instead of a stunbaton.
|
2018-09-26 22:23:46 -04:00 |
|
|
Tupinambis
|
6c57649625
|
Replaces the head of securities stun baton with telebaton.
|
2018-09-12 16:48:38 -05:00 |
|
|
Poojawa
|
b00a76476c
|
Oh hey, all of those compile fixes
|
2018-09-11 11:00:18 -05:00 |
|
|
Poojawa
|
284e9d0325
|
module things, jfc
|
2018-09-11 07:51:01 -05:00 |
|
|
deathride58andkevinz000
|
1bc8b3530c
|
Adds spawn text when spawning in as a miner. (#7555)
* adds spawn text when spawning in as a miner
* fixes compiling error
|
2018-09-07 07:22:44 -07:00 |
|
|
kevinz000
|
b99556c70f
|
Nanites port from /tg/station, original coder XDTM
|
2018-08-23 01:16:32 -07:00 |
|
|
deathride58
|
b1688405d9
|
and finally, the modules folder. Now I can publish and take a break
|
2018-07-02 01:19:37 -04:00 |
|
|
CitrusGenderandletterjay
|
d50ae43d7f
|
Fixed cyborgs not getting their names at round start
|
2018-06-24 13:55:03 -05:00 |
|
|
deathride58andGitHub
|
e279392386
|
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
|
2018-06-09 05:53:25 +00:00 |
|