cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-08 12:50:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
f94796c1257612e4f8639414d7dffdf3dd4dee09
Paradise/code/datums
T
History
Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
2019-04-10 21:54:54 +02:00
..
cache
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
components
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
diseases
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
helper_datums
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
looping_sounds
…
outfits
Merge pull request #10685 from datlo/SSThardsuitnammo
2019-01-22 06:31:09 +08:00
ruins
Add blooddrunk ruins
2019-04-04 22:23:01 +02:00
spells
Crit Rework Final Submission
2019-03-28 17:28:00 -04:00
status_effects
blood drunk miner
2019-04-04 20:34:26 +01:00
vr
…
weather
Finish up Lavaland map
2019-03-30 21:08:33 +01:00
wires
Now works!
2018-12-29 20:50:56 +01:00
action.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
ai_law_sets.dm
…
ai_laws.dm
Devil game mode
2019-01-13 12:00:49 +01:00
beam.dm
…
browser.dm
…
callback.dm
…
click_intercept.dm
…
datacore.dm
ID/Agent ID fixes
2019-01-27 20:36:51 +00:00
datum.dm
…
datumvars.dm
implements Dave's suggestion
2019-03-22 18:27:36 -07:00
gas_mixture.dm
makes agent B not suck
2019-03-24 02:21:45 -04:00
holocall.dm
…
hud.dm
forgot this hud.
2019-04-09 23:28:19 -04:00
mind.dm
The Nations Update Everyone Deserves!
2019-04-06 20:30:04 -04:00
mixed.dm
…
mutable_appearance.dm
…
periodic_news.dm
…
pipe_datums.dm
…
progressbar.dm
…
recipe.dm
…
ruins.dm
General Lavaland fixes, add Hierophant ruin
2019-03-31 01:12:10 +01:00
shuttles.dm
…
soullink.dm
Devil game mode
2019-01-13 12:00:49 +01:00
spawners_menu.dm
Fixed mob spawner menu, this time for real
2019-02-02 05:08:02 +01:00
spell.dm
Devil game mode
2019-01-13 12:00:49 +01:00
statclick.dm
…
supplypacks.dm
gosh dang
2019-04-01 16:22:20 -04:00
uplink_item.dm
Merge pull request #11270 from TDSSS/nukie-hijack
2019-04-09 22:47:26 -04:00
vision_override.dm
…
vr.dm
…