shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
a5de2a6620347223d4f0fc28b213d339e6607a13
GS13NG/code/modules
History
zerothebigboy a5de2a6620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
2021-02-14 10:42:59 -05:00
..
actionspeed
subsystem upgrades
2020-12-14 15:28:59 +08:00
admin
f
2021-02-08 16:59:54 -05:00
antagonists
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-14 10:42:59 -05:00
arousal
cleanup
2021-01-20 11:08:21 +08:00
assembly
Merge branch 'master' into revenant_TK
2021-01-20 18:27:11 +02:00
asset_cache
subsystem upgrades
2020-12-14 15:28:59 +08:00
atmospherics
Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor
2021-01-24 19:21:24 -05:00
awaymissions
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
bsql
funny
2020-11-12 23:34:42 -07:00
buildmode
funny
2020-11-12 23:34:42 -07:00
cargo
cleanup
2021-01-20 11:08:21 +08:00
chatter
ImmursionAudio(TM)
2020-12-21 19:47:11 +08:00
client
kay
2021-02-13 19:03:27 -07:00
clothing
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-14 10:42:59 -05:00
detectivework
…
economy
funny
2020-11-12 23:34:42 -07:00
emoji
…
error_handler
…
events
back down to fifteen
2021-02-10 11:08:03 -05:00
fields
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
flufftext
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
food_and_drinks
logging fixes
2021-02-13 19:47:17 -07:00
games
…
holiday
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
holodeck
…
hydroponics
Merge pull request #14102 from Hatterhat/somatobuff-50513
2021-01-25 23:17:29 -07:00
instruments
ImmursionAudio(TM)
2020-12-21 19:47:11 +08:00
integrated_electronics
Fixes nuclear and KA guns in IC
2021-01-30 12:13:06 +03:00
jobs
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
keybindings
Give hotkey, but citadel
2021-01-20 04:21:57 +02:00
language
Update signlanguage.dm
2021-01-31 14:14:12 -05:00
library
…
lighting
…
mafia
…
mapping
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
mining
Fixes some error, re adds knockdown
2021-01-30 16:19:09 -05:00
mob
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-14 10:42:59 -05:00
modular_computers
Update card.dm
2021-02-04 13:23:03 -07:00
movespeed
Merge pull request #13895 from Citadel-Station-13/silicons-patch-53
2021-01-31 23:35:37 -06:00
newscaster
…
ninja
conflicts and stealth nerf
2021-02-13 13:51:03 -05:00
NTNet
…
paperwork
More funshit
2021-01-20 18:23:28 +02:00
photography
…
plumbing
Review Change Request 1
2020-10-09 09:17:28 -04:00
pool
logging fixes
2021-02-13 19:47:17 -07:00
power
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
procedural_mapping
more
2020-11-12 23:36:18 -07:00
projectiles
fixes oversights
2021-02-08 14:43:33 +01:00
reagents
logging fixes
2021-02-13 19:47:17 -07:00
recycling
Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor
2021-01-24 19:21:24 -05:00
research
Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm
2021-02-05 00:59:19 -07:00
ruins
Merge pull request #14083 from shellspeed1/alternative-xeno-hive
2021-01-20 15:22:06 -07:00
security_levels
…
shielding
…
shuttle
cleanup
2021-01-20 11:08:21 +08:00
smithing
sheef
2021-01-19 16:54:49 -06:00
spells
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
station_goals
…
surgery
logging fixes
2021-02-13 19:47:17 -07:00
tgchat
…
tgs
Update TGS DMAPI
2020-12-29 00:59:40 +00:00
tgui
Ports https://github.com/tgstation/tgstation/pull/54895/
2020-11-16 15:19:31 +02:00
tgui_panel
…
tooltip
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
unit_tests
do-not-force-yet
2020-12-29 14:09:45 +08:00
uplink
Merge pull request #13890 from silicons/parry
2021-02-05 23:52:18 -06:00
vehicles
Update clowncar.dm
2021-01-07 17:11:03 -07:00
vending
More Clothes
2021-02-11 02:36:50 -05:00
vore
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
VR
…
zombie
more
2020-11-12 23:36:18 -07:00