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
9d04b0835b750ddbc6e977448b5c52f644917d05
S.P.L.U.R.T-Station-13/code/modules
History
Artur 9d04b0835b Conflicts galore
2020-05-21 21:08:12 +03:00
..
admin
Conflicts galore
2020-05-21 21:08:12 +03:00
antagonists
Conflicts galore
2020-05-21 21:08:12 +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
Fixes asset cache
2020-05-19 21:13:00 +03:00
atmospherics
Conflicts galore
2020-05-21 21:08:12 +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
Conflicts galore
2020-05-21 21:08:12 +03:00
clothing
Lavaland Gear Tweaks - Armor balancing (#12270)
2020-05-20 18:47:30 -07:00
detectivework
…
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
Conflicts galore
2020-05-21 21:08:12 +03:00
fields
…
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
Conflicts galore
2020-05-21 21:08:12 +03:00
games
…
goonchat
Fixing old and new issues alike. (#12281)
2020-05-17 16:47:53 -07:00
holiday
Porting "Personal interaction messages to simple animals" and more. (#12268)
2020-05-18 04:46:57 -07:00
holodeck
Conflicts galore
2020-05-21 21:08:12 +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
Add the pie-cannon sound to the circuit version of the pneumatic cannon (#12319)
2020-05-21 14:55:25 +02:00
jobs
Merge pull request #12189 from Ghommie/Ghommie-cit735
2020-05-14 04:46:24 -07:00
keybindings
Update movement.dm (#12327)
2020-05-21 15:00:21 +02: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
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
mapping
Fixes asset cache client
2020-05-19 19:02:46 +03:00
mining
Conflicts galore
2020-05-21 21:08:12 +03:00
mob
Conflicts galore
2020-05-21 21:08:12 +03:00
modular_computers
Coonflict fiiixeeess
2020-05-13 12:56:17 +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
Conflicts galore
2020-05-21 21:08:12 +03:00
photography
Porting tg painting code. (#12305)
2020-05-20 18:45:36 -07:00
pool
Two runtimes, one fix.
2020-03-21 23:23:31 +01:00
power
Conflicts galore
2020-05-21 21:08:12 +03:00
procedural_mapping
ok (#12161)
2020-05-09 14:21:27 +02:00
projectiles
Removal of """silk""" (#12221)
2020-05-19 23:43:46 -07:00
reagents
Conflicts galore
2020-05-21 21:08:12 +03:00
recycling
Conflicts galore
2020-05-21 21:08:12 +03:00
research
Conflicts galore
2020-05-21 21:08:12 +03:00
ruins
Conflicts galore
2020-05-21 21:08:12 +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
Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)
2020-05-20 18:42:58 -07:00
tgs
tgs 5.1.1
2020-05-15 23:20:34 -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
Conflicts galore
2020-05-21 21:08:12 +03:00
vore
Fixing old and new issues alike. (#12281)
2020-05-17 16:47:53 -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