shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ddcfcb5cd8fe7bbb8361c2a541cd1908add46296
GS13NG/code/modules
History
Artur ddcfcb5cd8 Conflicts sure are !!FUN!! 
Also adds dolphin gloves to the glove crate, and fixes fortitude
2020-04-15 12:33:59 +03:00
..
admin
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
antagonists
Conflicts sure are !!FUN!!
2020-04-15 12:33:59 +03:00
assembly
…
atmospherics
Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4
2020-04-12 05:46:07 +02:00
awaymissions
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
bsql
…
buildmode
…
cargo
Conflicts sure are !!FUN!!
2020-04-15 12:33:59 +03:00
chatter
…
client
Whops
2020-04-12 05:13:43 +02:00
clothing
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
detectivework
…
emoji
…
error_handler
…
events
Merge pull request #11729 from Ghommie/Ghommie-cit666
2020-04-04 19:19:25 -07:00
fields
…
flufftext
…
food_and_drinks
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
games
…
goonchat
…
holiday
…
holodeck
Update area_copy.dm
2020-04-13 03:29:07 +02:00
hydroponics
Fucking icons
2020-04-14 09:42:11 +03:00
instruments
fixes baystruments (#11790)
2020-04-10 15:36:42 +02:00
integrated_electronics
fix everything
2020-04-11 15:32:09 +08:00
jobs
missed one
2020-04-14 17:55:22 -05:00
keybindings
…
language
…
library
…
lighting
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
mapping
…
mining
Merge pull request #11618 from Arturlang/Garlic
2020-04-14 12:38:34 +02:00
mob
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
modular_computers
fix everything
2020-04-11 15:32:09 +08:00
newscaster
…
ninja
wew
2020-04-10 03:43:18 +01:00
NTNet
…
oracle_ui
…
paperwork
Merge pull request #11697 from Ghommie/Ghommie-cit655
2020-04-12 16:16:37 -07:00
photography
…
pool
…
power
Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5
2020-04-14 01:34:45 -07:00
procedural_mapping
…
projectiles
Conflict fixes
2020-04-14 09:27:54 +03:00
reagents
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
recycling
…
research
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
ruins
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
security_levels
…
shuttle
…
spells
Oopsie
2020-04-11 17:43:09 +02:00
station_goals
…
surgery
Merge pull request #11819 from Ghommie/Ghommie-cit672
2020-04-12 17:02:36 -07:00
tgs
…
tgui
…
tooltip
…
unit_tests
…
uplink
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers
2020-04-13 11:10:24 +08:00
vehicles
Update scooter.dm
2020-04-10 04:33:35 -07:00
vending
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
vore
fix everything
2020-04-11 15:32:09 +08:00
VR
…
zombie
…