cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
03d894ecfccc860c881ea25e6ea2daf64ec78a14
Paradise/code/modules
History
Fox McCloud 03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
..
admin
Merge branch 'master' into mhelp-ticket-system
2019-04-07 14:43:49 +02:00
alarm
…
antagonists
Redundant objective line removed, improved descriptions
2019-03-28 01:18:17 +01:00
arcade
…
assembly
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
atmos_automation
…
awaymissions
…
buildmode
Resolve some issues that the compiler doesn't spot
2019-03-29 16:21:15 +01:00
busy_space
…
client
Merge pull request #11242 from Markolie/hotkeymode
2019-04-07 21:21:21 +08:00
clothing
Updates and Buffs Power Gloves
2019-04-06 01:38:02 -04:00
countdown
…
crafting
…
customitems
Suicide Refactor
2019-03-27 22:54:26 -04:00
detective_work
…
discord
…
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
…
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
OHHHH SHITTTT ANTTTSSS
2019-04-01 01:27:49 -04:00
games
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
holiday
…
hydroponics
fixed deathnettle
2019-04-02 20:16:46 +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
…
lighting
…
logic
…
map_fluff
…
martial_arts
Merge remote-tracking branch 'upstream/master' into fix-cqc
2019-04-07 19:54:14 -04:00
mining
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
mob
Merge remote-tracking branch 'upstream/master' into fix-cqc
2019-04-07 19:54:14 -04:00
modular_computers
…
nano
…
ninja
…
paperwork
Merge pull request #11195 from Twinmold93/tonerless_sending
2019-04-06 03:15:53 -04:00
pda
…
persistence
…
power
Suicide Refactor
2019-03-27 22:54:26 -04:00
procedural_mapping
…
projectiles
Merge pull request #11126 from Arkatos1/Syndie_Borg_Medibeam
2019-04-02 07:19:52 -04:00
reagents
Merge pull request #11229 from Fox-McCloud/reagent-tweaks
2019-04-07 21:22:18 +08: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
…
security_levels
new siren
2019-03-28 22:43:06 -04:00
shuttle
Add mapload to shuttle computer Initialize
2019-04-01 23:30:40 +02:00
space_management
…
spacepods
…
station_goals
…
store
…
surgery
Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit
2019-04-07 20:30:48 +08:00
telesci
…
tooltip
…
tram
…
vehicle
…
vr
…