cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
19f215477e00e6f88534321993a7df695ae35d26
S.P.L.U.R.T-Station-13/code/modules
History
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
..
admin
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
antagonists
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +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
Dos2unix
2020-05-22 19:20:59 +03:00
atmospherics
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
awaymissions
Merge conflict fix
2020-05-13 12:37:18 +03:00
bsql
…
buildmode
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
cargo
Conflicts galore
2020-05-21 21:08:12 +03:00
chatter
…
client
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
clothing
Revamped the paper wizard robes. (#12348)
2020-05-27 18:01:22 -07:00
detectivework
Ports https://github.com/tgstation/tgstation/pull/51125/
2020-05-27 12:48:25 +03:00
economy
I set amount instead of max_amount to INFINITY, that's why it hanged.
2020-04-17 21:52:08 +02:00
emoji
…
error_handler
…
events
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
fields
Turning a few components into elements. (#12325)
2020-05-24 13:06:27 -07:00
flufftext
Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282)
2020-05-17 17:04:15 -07:00
food_and_drinks
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +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
Improvised Weapons Update: Part 1 (#12226)
2020-05-28 23:24:42 -07:00
holodeck
Ports https://github.com/tgstation/tgstation/pull/51125/
2020-05-27 12:48:25 +03:00
hydroponics
Conflicts galore
2020-05-21 21:08:12 +03:00
instruments
Instruments no longer keep updating if you aren't holding them etc etc (#12165)
2020-05-09 03:15:42 +02:00
integrated_electronics
Fixing a few issues with the nutrition adjustment proc and the circuit printer. (#12320)
2020-05-21 10:10:59 -07:00
jobs
Merge pull request #12189 from Ghommie/Ghommie-cit735
2020-05-14 04:46:24 -07:00
keybindings
Combat mode component. (#12338)
2020-05-27 18:00:32 -07: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
let's play the optimization game featuring lighting (#12310)
2020-05-23 22:47:42 +02:00
mapping
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
mining
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
mob
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
modular_computers
Ports https://github.com/tgstation/tgstation/pull/51125/
2020-05-27 12:48:25 +03:00
movespeed
Fixing some issues with floating movetype & co. (#12262)
2020-05-18 04:44:19 -07:00
newscaster
Field of Vision component. (#12075)
2020-05-15 15:25:04 -07:00
ninja
Ports TG Icemoon framework and map (#49680) (#12002)
2020-05-07 14:46:16 +02:00
NTNet
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
paperwork
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
photography
Porting updates related to material datums. (#12317)
2020-05-25 14:21:00 -07:00
pool
…
power
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
procedural_mapping
ok (#12161)
2020-05-09 14:21:27 +02:00
projectiles
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
reagents
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
recycling
Conflicts galore
2020-05-21 21:08:12 +03:00
research
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
ruins
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
security_levels
Conflicts galore
2020-05-21 21:08:12 +03:00
shuttle
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
spells
Conflicts galore
2020-05-21 21:08:12 +03:00
station_goals
Merge conflict fix
2020-05-13 12:37:18 +03:00
surgery
Makes bloodsuckers unguttable and undecappable (#12335)
2020-05-24 13:08:18 -07: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
Porting tg painting code. (#12305)
2020-05-20 18:45:36 -07:00
tooltip
…
unit_tests
…
uplink
I did a typo.
2020-05-14 13:44:06 +02:00
vehicles
Porting tesla/electrocute code updates. (#12280)
2020-05-17 16:35:17 -07:00
vending
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
vore
Readded feeding to simplemobs (#12378)
2020-05-29 20:01:51 -07:00
VR
Field of Vision component. (#12075)
2020-05-15 15:25:04 -07:00
zombie
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00