shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
8456b3f709974b2359503658aea7d1622e64dc8b
GS13NG/code/modules
History
zerothebigboy 8456b3f709 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/clothing/suits.dmi
2021-03-19 14:30:05 -04:00
..
actionspeed
…
admin
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-03-16 19:19:12 -04:00
antagonists
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-03-19 14:30:05 -04:00
arousal
don't push before thinking, kids
2021-02-20 07:41:37 -08:00
assembly
…
asset_cache
missing icon fix & stop throwing out parts
2021-03-05 19:29:52 +08:00
atmospherics
final fix
2021-03-08 13:24:28 +08:00
awaymissions
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
buildmode
…
cargo
Also reduces nitryl since I changed that too
2021-03-14 20:28:35 -07:00
chatter
…
client
Relabeled to "Antag"; unambiguized in
2021-03-16 22:53:55 -07:00
clothing
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-03-19 14:30:05 -04:00
detectivework
…
economy
…
emoji
…
error_handler
…
events
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-03-19 14:30:05 -04:00
fields
adds domain expansion
2021-03-11 21:26:58 -08:00
flufftext
…
food_and_drinks
Merge pull request #14374 from SandPoot/don't-litter-please
2021-03-09 00:20:43 -07:00
games
…
holiday
Update jacqueen.dm
2021-02-20 20:55:31 -07:00
holodeck
Messages admins of certain holodeck actions
2021-02-15 19:55:05 -07:00
hydroponics
Update hydroponics.dm
2021-02-28 01:23:37 -07:00
instruments
…
integrated_electronics
upload files
2021-02-18 15:05:39 -03:00
jobs
Update paramedic.dm
2021-03-08 18:31:34 -08:00
keybindings
…
language
forgive me linters for i have sinned
2021-03-14 22:43:48 +00:00
library
aeiou
2021-03-01 21:55:34 +08:00
lighting
…
mafia
…
mapping
…
mining
Update necropolis_chests.dm
2021-03-15 19:05:25 -07:00
mob
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-03-19 14:30:05 -04:00
modular_computers
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00
movespeed
Merge pull request #14391 from kiwedespars/void-but-for-real
2021-03-18 06:38:40 -06:00
newscaster
upload files
2021-02-18 15:05:39 -03:00
ninja
ffffffffff
2021-03-16 19:52:00 -04:00
NTNet
…
paperwork
paperwork mini update, also ASS_BLAST_USA
2021-03-06 19:28:29 +08:00
photography
upload files
2021-02-18 15:05:39 -03:00
plumbing
…
pool
…
power
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
2021-03-16 07:39:41 +01:00
procedural_mapping
…
projectiles
Merge branch 'master' into async_2
2021-03-09 00:17:26 -07:00
reagents
Corrects Hexacamphor
2021-03-10 00:35:00 +02:00
recycling
upload files
2021-02-18 15:05:39 -03:00
research
Merge pull request #14444 from DeltaFire15/jar-removal
2021-03-18 06:41:38 -06:00
ruins
Update necropolis_gate.dm
2021-03-08 19:16:23 -07:00
security_levels
…
shielding
…
shuttle
fix surgery cb, linter
2021-03-06 11:22:01 +08:00
smithing
WHY WON'T YOU HIDE CORRECTLY
2021-03-01 22:33:21 -06:00
spells
Update shapeshift.dm
2021-03-02 02:40:23 +01:00
station_goals
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
surgery
Merge pull request #14310 from Hatterhat/robo-surgery
2021-03-12 19:40:02 -07:00
tcg
Merge pull request #14293 from SmArtKar/tcg_gaming
2021-02-28 01:26:56 -07:00
tgchat
ae
2021-03-04 22:01:46 +08:00
tgs
…
tgui
ae
2021-03-04 22:01:46 +08:00
tgui_panel
ae
2021-03-04 22:01:46 +08:00
tooltip
…
unit_tests
…
uplink
removes illegal tech from a few common items that can be found in space/gateway exploration
2021-03-12 17:31:54 -05:00
vehicles
…
vending
HOTFIX AEIOU
2021-03-04 16:20:44 +08:00
vore
Update vorepanel.dm
2021-02-26 19:36:44 -06:00
VR
…
zombie
…