shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
bb81a0850b46e562fe1a4ed8f360bb042af164d5
GS13NG/code/modules
History
Carlen White bb81a0850b Merge branch 'master' into batch-check-injuries 
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
2019-07-14 20:49:52 -04:00
..
admin
Merge pull request #8886 from Ghommie/Ghommie-cit137
2019-07-14 14:05:20 -07:00
antagonists
Merge pull request #8869 from Ghommie/Ghommie-cit129
2019-07-14 14:49:11 -07:00
assembly
…
atmospherics
Normalizes Air Alarms
2019-07-12 15:04:43 -07:00
awaymissions
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
bsql
…
buildmode
…
cargo
Ports "Fixes default supplypods exploding their contents" & co.
2019-07-04 22:35:13 +02:00
chatter
…
client
Merge pull request #8857 from Ghommie/Ghoomie-cit127
2019-07-14 03:38:45 -07:00
clothing
Merge pull request #8693 from Ghommie/Ghommie-cit70
2019-07-14 14:52:29 -07:00
crafting
Merge branch 'master' into meme_tools
2019-06-23 21:07:55 -04:00
detectivework
…
emoji
…
error_handler
…
events
Merge pull request #8886 from Ghommie/Ghommie-cit137
2019-07-14 14:05:20 -07:00
fields
…
flufftext
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
food_and_drinks
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
games
thatwasreallyannoying
2019-06-24 20:21:27 -04:00
goonchat
Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
2019-07-05 06:57:49 -07:00
holiday
…
holodeck
…
hydroponics
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58
2019-07-04 23:46:04 +02:00
integrated_electronics
Update output.dm
2019-06-30 03:55:03 -07:00
jobs
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
2019-07-14 14:11:09 -07:00
keybindings
…
language
…
library
Ports "Removes SSreligion"
2019-06-23 01:45:21 +02:00
lighting
…
mapping
…
mining
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
mob
Merge branch 'master' into batch-check-injuries
2019-07-14 20:49:52 -04:00
modular_computers
Ports in radials for reagent grinders, alt click to eject beaker and beaker swapping.
2019-06-23 04:32:39 +02:00
ninja
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
NTNet
…
paperwork
Merge pull request #8802 from Ghommie/Ghommie-cit101
2019-07-07 02:39:07 -07:00
photography
…
power
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
procedural_mapping
…
projectiles
Revert "Fixes rocket launchers, buffing their accuracy etc."
2019-07-08 07:17:49 +02:00
reagents
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
2019-07-14 14:48:49 -07:00
recycling
…
research
Merge pull request #8725 from Trilbyspaceclone/meme_tools
2019-07-14 14:48:27 -07:00
ruins
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
2019-06-28 20:32:15 -07:00
security_levels
…
shuttle
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
spells
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
station_goals
…
surgery
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
tgs
…
tgui
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-12 07:39:17 +02:00
tooltip
…
unit_tests
👀
2019-06-17 11:18:30 +02:00
uplink
Merge pull request #8676 from Trilbyspaceclone/patch-176
2019-07-14 14:46:44 -07:00
vehicles
Update wheelchair.dm
2019-06-28 04:42:55 -07:00
vending
Ports "Adds blueshirt items to sectech and defines them better."
2019-07-13 06:42:09 +02:00
VR
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
zombie
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00