shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9647de2806a507eaa94bdf9adce7110235fafe1d
GS13NG/code/modules
History
deathride58 9647de2806 Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788 
[MIRROR] Fixed paperbin dropping and fingerprints
2018-04-10 07:20:33 +00:00
..
admin
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
antagonists
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
assembly
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
atmospherics
Merge branch 'master' into synctesting
2018-04-08 03:41:50 +00:00
awaymissions
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
cargo
Merge branch 'master' into upstream-merge-36442
2018-04-01 19:50:37 -05:00
chatter
…
client
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
clothing
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
crafting
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
detectivework
Detective Scanner Fixes (#36915)
2018-04-09 13:05:30 -05:00
emoji
…
error_handler
…
events
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
fields
…
flufftext
Fixes bloodbath effects not working on people in crit (#36598)
2018-04-03 22:01:59 -05:00
food_and_drinks
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
games
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
goonchat
…
holiday
Finishes overflow roles (#37053)
2018-04-09 05:10:14 -05:00
holodeck
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
hydroponics
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
integrated_electronics
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
jobs
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
keybindings
[MIRROR] Moves quick equip hotkey up to /mob (#6229)
2018-04-02 01:36:42 -05:00
language
…
library
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
lighting
…
mapping
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
mining
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
mob
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
modular_computers
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
ninja
…
NTNet
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
orbit
…
paperwork
Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788
2018-04-10 07:20:33 +00:00
power
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
procedural_mapping
…
projectiles
getStaminaLoss()
2018-04-07 23:39:48 -04:00
reagents
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
recycling
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
research
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
ruins
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
security_levels
…
server_tools
…
shuttle
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
spells
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
station_goals
…
stock_market
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
surgery
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
telesci
…
tgui
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
tooltip
…
unit_tests
…
uplink
…
vehicles
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
vending
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
VR
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
zombie
…