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
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
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
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
0a560b171c
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-27 13:01:27 +02:00
1a92134ad3
b
2019-07-25 21:43:02 -04:00
ee32e1680f
Ports "Replaces radio channel names and keys with defines"
2019-07-17 00:52:41 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
da8b43f054
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
...
Makes Clowns and HonkMother Chaplins smile!
2019-07-14 14:11:09 -07:00
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
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
937d6467e6
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
2019-06-30 19:16:27 +01:00
688fabfffc
Honk
2019-06-29 21:03:38 -04:00
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
3291b9c47a
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
2019-06-28 23:17:12 +02:00
38bc8a4efd
Ports "Removes SSreligion"
2019-06-23 01:45:21 +02:00
6b9becce71
Merge branch 'pr/14'
2019-06-14 21:29:04 +01:00
0b53df47de
Enough clowning around.
2019-06-07 03:22:26 +02:00
79a7b6b45b
Fixes.
2019-05-27 20:25:57 +01:00
246a344fed
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
2019-05-16 00:58:30 +01:00
9374e83e7d
fixes armor plate oversight
2019-05-01 00:05:14 -05:00
d243fc3214
Remove kebab's omegastation's jobs
2019-03-31 17:44:11 -04:00
ee736864a0
fixes nameless captains making the announce message show up as "Captain Captain on deck!
2019-03-01 01:03:31 -05:00
781a15c81e
adds the ability to mark your character as nameless
2019-02-21 06:19:43 -05:00
8812ef9ddd
exemption
2018-12-16 11:05:26 -08:00
a9cc6b0509
fixes job exp requirements by unmodularizing job list defines ( #7703 )
2018-11-08 01:47:08 -08:00
33d2a20ef2
first nerf of Mining armor, F in chat
2018-10-04 21:37:26 -05:00
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
6c57649625
Replaces the head of securities stun baton with telebaton.
2018-09-12 16:48:38 -05:00
b00a76476c
Oh hey, all of those compile fixes
2018-09-11 11:00:18 -05:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
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
b99556c70f
Nanites port from /tg/station, original coder XDTM
2018-08-23 01:16:32 -07:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
d50ae43d7f
Fixed cyborgs not getting their names at round start
2018-06-24 13:55:03 -05:00
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
7be9b6ebf9
Antag reputation rewards are now configurable
2018-06-03 09:03:51 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
7bb6bc8dd3
[MIRROR] HoP/QM have access to vault ( #6818 )
...
* Vault Access for QM (#37880 )
* HoP/QM have access to vault
* Update captain.dm
2018-05-27 17:25:18 -07:00
f2fdbab0cb
Adjust antag rep values
2018-05-25 14:14:24 -05:00
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
37b9d589ad
Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396
...
[MIRROR] Track admin observer time
2018-05-11 03:45:11 +00:00
ab81220eda
Adds a French beret! HONH HONH HONH! ( #37457 )
...
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.
Ready for merge.
2018-05-09 16:03:28 -05:00
baee4dead5
Merge pull request #37396 from KorPhaeron/mrcitruswantsyoutoclockin
...
Track admin observer time
2018-05-08 13:38:13 -05:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
fbaa2d5ae8
Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132
...
[MIRROR] Fixes brain dna
2018-04-14 07:44:36 -05:00
Thalpy