shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9e04d5723c22f6dfd81f41990a40f2f26a40fa1e
GS13NG/code/modules
History
zerothebigboy a8315a69e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe 
# Conflicts:
#	icons/mob/clothing/belt.dmi
#	icons/obj/clothing/belts.dmi
2020-10-11 01:19:18 -04:00
..
actionspeed
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
admin
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
antagonists
Merge pull request #13233 from Hatterhat/za-hando
2020-10-10 21:59:05 -07:00
arousal
…
assembly
…
asset_cache
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
atmospherics
Merge pull request #13449 from Citadel-Station-13/silicons-patch-4
2020-10-07 15:10:48 -07:00
awaymissions
…
bsql
…
buildmode
…
cargo
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
chatter
…
client
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
clothing
Merge pull request #13535 from Hatterhat/energy-sabres
2020-10-10 22:04:17 -07:00
detectivework
…
economy
…
emoji
…
error_handler
…
events
fixes a bunch of portal runtimes
2020-10-10 23:40:12 +02:00
fields
…
flufftext
…
food_and_drinks
Merge pull request #13533 from shellspeed1/jambalya-
2020-10-10 22:02:46 -07:00
games
…
holiday
Errant comment
2020-10-06 00:22:38 +01:00
holodeck
…
hydroponics
enabled plumbing on trays.
2020-10-08 22:50:24 -04:00
instruments
…
integrated_electronics
…
jobs
…
keybindings
Update movement.dm
2020-10-07 10:46:00 -07:00
language
…
library
…
lighting
…
mafia
…
mapping
Merge pull request #13014 from Hatterhat/tendril-minimum
2020-10-10 21:58:15 -07:00
mining
glaive daggers squashed
2020-10-03 14:32:19 -05:00
mob
Merge pull request #13497 from Zandario/species-refactor
2020-10-10 22:00:49 -07:00
modular_computers
…
movespeed
FUCK
2020-10-01 23:40:57 +01:00
newscaster
…
ninja
…
NTNet
…
paperwork
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
photography
…
plumbing
Review Change Request 1
2020-10-09 09:17:28 -04:00
pool
…
power
Merge pull request #13527 from ArchieBeepBoop/rtg
2020-10-10 22:01:20 -07:00
procedural_mapping
…
projectiles
fixes a bunch of portal runtimes
2020-10-10 23:40:12 +02:00
reagents
Merge pull request #13497 from Zandario/species-refactor
2020-10-10 22:00:49 -07:00
recycling
…
research
Merge pull request #13540 from TheObserver-sys/QoLPass
2020-10-10 22:04:49 -07:00
ruins
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
security_levels
…
shielding
…
shuttle
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
smithing
Merge pull request #13481 from DeltaFire15/smithery-fixes
2020-10-03 18:02:42 -07:00
spells
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
station_goals
…
surgery
Merge pull request #13531 from DeltaFire15/quick-fix
2020-10-10 15:33:59 -07:00
tgchat
…
tgs
…
tgui
…
tgui_panel
…
tooltip
mass ports like 15 tg prs + counting (#13386)
2020-10-10 12:20:33 +02:00
unit_tests
…
uplink
Merge pull request #13233 from Hatterhat/za-hando
2020-10-10 21:59:05 -07:00
vehicles
…
vending
crepe
2020-10-10 21:39:45 -04:00
vore
Merge pull request #13526 from Putnam3145/fix-vore-AGAIN-PLEASE
2020-10-06 17:06:08 -07:00
VR
…
zombie
…