shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b161047f71002e43e777fac736da352a062afdae
GS13NG/code/modules
History
LetterJay b161047f71 Merge pull request #6747 from Citadel-Station-13/upstream-merge-37851 
[MIRROR] Send jquery asset when initializing tooltips
2018-05-14 22:16:12 -05:00
..
admin
Fixes possession funtime (#37737)
2018-05-12 19:26:55 -05:00
antagonists
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
2018-05-14 12:28:41 -05:00
assembly
Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558
2018-05-12 21:36:51 -05:00
atmospherics
Merge branch 'master' into upstream-merge-37406
2018-05-13 03:28:37 -05:00
awaymissions
Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes
2018-04-30 21:19:22 -05:00
cargo
Bring gender equality to Corgi crates (#37748)
2018-05-10 19:57:20 -05:00
chatter
…
client
Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2
2018-05-14 16:51:20 -05:00
clothing
Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525
2018-05-13 20:38:49 -05:00
crafting
Merge pull request #37580 from 81Denton/craftable-hudsunglasses
2018-05-01 15:35:22 -05:00
detectivework
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05: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 #37590 from 81Denton/cargo-categories
2018-05-01 15:37:54 -05:00
fields
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
flufftext
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
food_and_drinks
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
2018-05-14 12:28:41 -05:00
games
…
goonchat
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
holiday
drone masks for holidays
2018-05-09 13:42:54 -05:00
holodeck
Merge pull request #37549 from ShizCalev/bounce_away-fixes
2018-04-30 12:51:40 -05:00
hydroponics
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
2018-05-14 12:28:41 -05:00
integrated_electronics
Integrated Circuits: String parsing update (#37571)
2018-05-09 00:44:59 -05:00
jobs
Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396
2018-05-11 03:45:11 +00:00
keybindings
Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413
2018-04-27 09:36:44 +00:00
language
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
library
everything but mob stuff
2018-04-23 01:06:17 -05:00
lighting
everything but mob stuff
2018-04-23 01:06:17 -05:00
mapping
Merge pull request #37549 from ShizCalev/bounce_away-fixes
2018-04-30 12:51:40 -05:00
mining
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
2018-05-14 12:28:41 -05:00
mob
Fixes wumborian fugu dead sprite (#37832)
2018-05-14 18:55:54 -05:00
modular_computers
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
ninja
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
NTNet
NTNet improvements!
2018-04-27 20:24:28 -05:00
orbit
…
paperwork
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
power
Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-11 17:30:32 -05:00
procedural_mapping
everything but mob stuff
2018-04-23 01:06:17 -05:00
projectiles
Fixes defibs/watertanks/gatling lasers (#37792)
2018-05-13 06:13:45 -05:00
reagents
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
2018-05-14 12:28:41 -05:00
recycling
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
research
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
2018-05-14 12:28:41 -05:00
ruins
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
security_levels
…
server_tools
…
shuttle
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
spells
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
station_goals
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
stock_market
Removes stock market
2018-05-02 17:48:55 -05:00
surgery
Plasmamen organs GET sprites! (#37595)
2018-05-02 21:21:11 -05:00
tgui
…
tooltip
Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2
2018-05-14 16:51:20 -05:00
unit_tests
…
uplink
fixes some inconsistency in the bulldog shotgun ammo (#37548)
2018-05-09 16:24:17 -05:00
vehicles
fixes the laws of matter conservation (#37300)
2018-04-20 15:32:32 -05:00
vending
Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589
2018-05-13 11:52:12 -05:00
VR
Merge branch 'master' into upstream-merge-36974
2018-04-10 07:48:12 +00:00
zombie
…