shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2797aefc3a57d97e6b9e4118a1e9ade70b4ea5df
GS13NG/code/modules
History
Artur 2797aefc3a Clockworkslab and ui resizing
2020-06-30 01:05:43 +03:00
..
admin
Cooonflicts
2020-06-16 01:23:42 +03:00
antagonists
Clockworkslab and ui resizing
2020-06-30 01:05:43 +03:00
arousal
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731
2020-05-11 00:34:22 +02:00
assembly
Compile
2020-05-13 13:52:12 +03:00
asset_cache
Conflicts!!!
2020-06-22 17:39:24 +03:00
atmospherics
Cooonflicts
2020-06-16 01:23:42 +03:00
awaymissions
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
bsql
…
buildmode
…
cargo
Conflicts!!!
2020-06-22 17:39:24 +03:00
chatter
…
client
Conflicts!!!
2020-06-22 17:39:24 +03:00
clothing
Merge pull request #12570 from NopemanMcHalt/orvilike_bonus
2020-06-24 08:43:03 -07:00
detectivework
Ports https://github.com/tgstation/tgstation/pull/51125/
2020-05-27 12:48:25 +03:00
economy
…
emoji
…
error_handler
…
events
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
fields
Turning a few components into elements. (#12325)
2020-05-24 13:06:27 -07:00
flufftext
Fixing the snore-pocalypse, and another not so critical issue.
2020-06-24 23:08:40 +02:00
food_and_drinks
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
games
Adds unum (#12369)
2020-05-28 15:47:44 +02:00
goonchat
For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
2020-05-30 03:17:56 +02:00
holiday
last ones
2020-06-17 21:37:19 -07:00
holodeck
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
hydroponics
Conflicts!!!
2020-06-22 17:39:24 +03:00
instruments
Fixing stationary and instrument-less song datum UIs not updating. (#12425)
2020-06-04 15:53:57 -07:00
integrated_electronics
Fix square root circuit to check the only input it has
2020-06-18 08:50:29 +12:00
jobs
Adds Pride Month as a holiday! (#12436)
2020-06-04 15:40:31 -07:00
keybindings
Merge pull request #11627 from kevinz000/combat_rework
2020-06-12 16:39:11 -05:00
language
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
library
Merge conflict fix
2020-05-13 12:37:18 +03:00
lighting
Update emissive_blocker.dm
2020-06-12 15:13:34 -07:00
mapping
Compile
2020-06-22 21:30:54 +03:00
mining
Conflicts!!!
2020-06-22 17:39:24 +03:00
mob
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
modular_computers
Ports https://github.com/tgstation/tgstation/pull/51152
2020-06-17 17:01:55 +03:00
movespeed
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
newscaster
Field of Vision component. (#12075)
2020-05-15 15:25:04 -07:00
ninja
part 2
2020-06-10 23:14:25 +01:00
NTNet
…
paperwork
Conflicts!!!
2020-06-22 17:39:24 +03:00
photography
Actually Balanced and Standardized Vendor Prices. (#12495)
2020-06-09 22:22:53 -07:00
pool
…
power
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
procedural_mapping
ok (#12161)
2020-05-09 14:21:27 +02:00
projectiles
haha whew
2020-06-17 21:32:10 -07:00
reagents
Clockworkslab and ui resizing
2020-06-30 01:05:43 +03:00
recycling
Conflicts!!!
2020-06-22 17:39:24 +03:00
research
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
ruins
Conflicts!!!
2020-06-22 17:39:24 +03:00
security_levels
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
shuttle
Conflicts!!!
2020-06-22 17:39:24 +03:00
spells
Conflicts!!!
2020-06-22 17:39:24 +03:00
station_goals
Merge conflict fix
2020-05-13 12:37:18 +03:00
surgery
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
tgs
updates dmapi from dmapi 5.1.0 to dmapi 5.2.1 (based off tgstation/tgstation#51100 ) (#12364)
2020-05-27 17:58:43 -07:00
tgui
More vr sleeper work and map fix
2020-06-09 11:06:16 +03:00
tooltip
…
unit_tests
…
uplink
smol fix
2020-06-21 03:44:12 +02:00
vehicles
Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)
2020-06-17 19:33:14 -05:00
vending
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
vore
Readded feeding to simplemobs (#12378)
2020-05-29 20:01:51 -07:00
VR
Fucking vr sleeper aaa
2020-06-16 01:18:59 +03:00
zombie
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00