cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-06 05:53:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
f94796c1257612e4f8639414d7dffdf3dd4dee09
Paradise/code/modules
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
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
alarm
…
antagonists
The Nations Update Everyone Deserves!
2019-04-06 20:30:04 -04:00
arcade
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-19 23:35:15 -05:00
assembly
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
atmos_automation
…
awaymissions
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
buildmode
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
busy_space
…
client
Merge pull request #11242 from Markolie/hotkeymode
2019-04-07 21:21:21 +08:00
clothing
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
countdown
…
crafting
Port over Corn and affected's work on Lavaland
2019-04-01 23:41:32 +02:00
customitems
Suicide Refactor
2019-03-27 22:54:26 -04:00
detective_work
the rerefactor
2019-01-22 10:32:44 +00:00
discord
Moves discord verbs to "Special Verbs" instead of "OOC"
2019-03-04 15:49:10 +00:00
economy
…
error_handler
…
events
Merge pull request #11179 from Ty-Omaha/grid-check
2019-04-02 18:16:15 -04:00
examine
Merge pull request #11170 from Fox-McCloud/trick-revolver
2019-04-02 18:33:24 +08:00
ext_scripts
Fuckin' indents
2019-02-09 10:08:44 +00:00
fancytitle
…
fish
Suicide Refactor
2019-03-27 22:54:26 -04:00
flufftext
Resolve some issues that the compiler doesn't spot
2019-03-29 16:21:15 +01:00
food_and_drinks
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-04 22:04:55 +02:00
games
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
holiday
…
hydroponics
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-04 22:04:55 +02:00
karma
Revert "Revert "Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2""
2019-03-07 17:43:19 -05:00
library
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
lighting
Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light
2019-02-02 22:53:46 -06:00
logic
…
map_fluff
…
martial_arts
more hit type verbs
2019-04-09 21:57:47 -04:00
mining
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
modular_computers
…
nano
fixed spacing
2019-02-02 13:52:25 +01:00
ninja
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
paperwork
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
pda
Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light
2019-02-02 22:53:46 -06:00
persistence
…
power
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
procedural_mapping
Add Beach biodome ruin and other fixes
2019-03-30 22:48:11 +01:00
projectiles
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-04 22:04:55 +02:00
reagents
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
recycling
target dun exist and user
2019-03-29 09:05:30 +01:00
research
Merge pull request #11157 from Fox-McCloud/chem-master-refactor
2019-04-01 23:06:42 +08:00
response_team
Crit Rework Final Submission
2019-03-28 17:28:00 -04:00
ruins
Add seed vault and animal hospital
2019-03-31 23:49:18 +02:00
security_levels
new siren
2019-03-28 22:43:06 -04:00
shuttle
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-02 00:54:49 +02:00
space_management
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
spacepods
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
station_goals
…
store
…
surgery
Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit
2019-04-07 20:30:48 +08:00
telesci
updated denied message
2019-02-19 21:25:58 +00:00
tooltip
…
tram
…
vehicle
Largely finish up beach ruin
2019-03-31 00:20:27 +01:00
vr
…