shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
165966ffebf53703e127d11bf82e45804d387715
GS13NG/code/modules
History
zerothebigboy 165966ffeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/suit.dmi
2021-02-28 22:13:00 -05:00
..
actionspeed
…
admin
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-28 22:13:00 -05:00
antagonists
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-28 22:13:00 -05:00
arousal
don't push before thinking, kids
2021-02-20 07:41:37 -08:00
assembly
…
asset_cache
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
2021-02-18 15:04:46 -03:00
atmospherics
upload files
2021-02-18 15:05:39 -03:00
awaymissions
rice hat fix
2021-02-12 16:13:59 -06:00
bsql
…
buildmode
…
cargo
Decks are saveable!
2021-02-17 18:50:23 +03:00
chatter
…
client
Merge pull request #14269 from Putnam3145/aphro-readd
2021-02-21 14:50:32 -07:00
clothing
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-28 22:13:00 -05:00
detectivework
…
economy
…
emoji
…
error_handler
…
events
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-28 22:13:00 -05:00
fields
…
flufftext
…
food_and_drinks
Merge pull request #14268 from Citadel-Station-13/silicons-patch-16
2021-02-23 13:01:27 +01: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
Merge pull request #14265 from SandPoot/tool_behavior-replacing
2021-02-21 14:48:50 -07:00
instruments
…
integrated_electronics
upload files
2021-02-18 15:05:39 -03:00
jobs
…
keybindings
…
language
…
library
upload files
2021-02-18 15:05:39 -03:00
lighting
…
mafia
…
mapping
…
mining
upload files
2021-02-18 15:05:39 -03:00
mob
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-02-28 22:13:00 -05:00
modular_computers
Makes tablets not permacontam.
2021-02-25 05:55:44 -08:00
movespeed
…
newscaster
upload files
2021-02-18 15:05:39 -03:00
ninja
trynna nerf cloak more
2021-02-13 16:33:44 -05:00
NTNet
…
paperwork
upload files
2021-02-18 15:05:39 -03:00
photography
upload files
2021-02-18 15:05:39 -03:00
plumbing
…
pool
logging fixes
2021-02-13 19:47:17 -07:00
power
upload files
2021-02-18 15:05:39 -03:00
procedural_mapping
…
projectiles
upload files
2021-02-18 15:05:39 -03:00
reagents
Merge pull request #14325 from dzahlus/slime-fix
2021-02-27 14:41:33 -06:00
recycling
upload files
2021-02-18 15:05:39 -03:00
research
upload files
2021-02-18 15:05:39 -03:00
ruins
…
security_levels
…
shielding
…
shuttle
upload files
2021-02-18 15:05:39 -03:00
smithing
…
spells
…
station_goals
upload files
2021-02-18 15:05:39 -03:00
surgery
Update code/modules/surgery/advanced/toxichealing.dm
2021-02-26 10:06:53 -03:00
tcg
Merge pull request #14293 from SmArtKar/tcg_gaming
2021-02-28 01:26:56 -07:00
tgchat
…
tgs
…
tgui
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
2021-02-18 15:04:46 -03:00
tgui_panel
…
tooltip
…
unit_tests
…
uplink
Merge pull request #14253 from keronshb/eutactic_blade_restoration
2021-02-22 13:10:21 -07:00
vehicles
…
vending
Merge pull request #14279 from Adelphon/boon
2021-02-21 14:53:39 -07:00
vore
Update vorepanel.dm
2021-02-26 19:36:44 -06:00
VR
…
zombie
…