shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
c40a2e698d92cd92fc2af1005634ba58b3b7cf88
GS13NG/code/modules
History
LetterJay c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 
[MIRROR] Fix being able to pull mirage borders, others
2018-06-18 10:09:20 -05:00
..
admin
Update randomverbs.dm
2018-06-16 16:47:19 -05:00
antagonists
Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424
2018-06-12 08:08:39 -05:00
assembly
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
atmospherics
Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496
2018-06-18 10:09:20 -05:00
awaymissions
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
cargo
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
chatter
…
client
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
clothing
Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes
2018-06-11 22:29:43 -05:00
crafting
replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2
2018-05-02 13:14:43 -05:00
detectivework
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
emoji
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
error_handler
Readds dropped #endif (#37174)
2018-04-13 22:10:47 -05:00
events
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
fields
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
flufftext
[s] Hallucinations 4.0
2018-05-09 16:15:58 -05:00
food_and_drinks
[MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094)
2018-06-15 02:46:40 -07:00
games
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
goonchat
Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup
2018-06-11 22:29:36 -05:00
holiday
drone masks for holidays
2018-05-09 13:42:54 -05:00
holodeck
[MIRROR] Turf grammar omnibus (#7104)
2018-06-13 19:31:29 -07:00
hydroponics
[MIRROR] [s] Fixes exploit where botany trays can be refilled at no cost. (#7081)
2018-06-13 20:25:08 -07:00
integrated_electronics
Merge pull request #38456 from theo2003/circuit_scan
2018-06-16 06:18:46 -05:00
jobs
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
keybindings
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
language
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
library
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
lighting
AI Multicamera mode (#37695)
2018-05-31 22:41:48 -05:00
mapping
[MIRROR] Fixes loading zlevels with static lighting. (#7051)
2018-06-10 12:32:58 -07:00
mining
Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders
2018-06-16 15:50:27 -05:00
mob
Makes the caravan ambush ruin harder to cheese (#38509)
2018-06-16 15:38:34 -05:00
modular_computers
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
ninja
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
NTNet
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
orbit
…
paperwork
[MIRROR] You can see what other people eat or drink (#7101)
2018-06-13 20:31:38 -07:00
power
Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360
2018-06-12 07:41:10 -05:00
procedural_mapping
everything but mob stuff
2018-04-23 01:06:17 -05:00
projectiles
[MIRROR] Fixes null bullets from being fired after they're deleted (#7102)
2018-06-15 02:48:48 -07:00
reagents
Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510
2018-06-18 09:52:24 -05:00
recycling
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
research
Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360
2018-06-12 07:41:10 -05:00
ruins
Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders
2018-06-16 15:50:27 -05:00
security_levels
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
shuttle
[s] Prevent unbreakable ladders from being moved by shuttles (#38477)
2018-06-16 06:18:08 -05:00
spells
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
station_goals
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
surgery
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
tgs
Update DMAPI to version 3.2.1.0
2018-05-08 21:33:58 -05:00
tgui
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
tooltip
Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2
2018-05-14 16:51:20 -05:00
unit_tests
…
uplink
[MIRROR] [s] Fixes syndicate sentience exploit (#7021)
2018-06-05 23:14:48 -07:00
vehicles
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
vending
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
VR
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
zombie
…