cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f63a9c279ccea1b690df062d041e8fac8b34fcbf
Paradise/code/modules
History
Markolie f63a9c279c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/defines/procs/announce.dm
#	code/modules/events/mass_hallucination.dm
2016-10-31 14:46:58 +01:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-10-31 14:46:58 +01:00
alarm
…
arcade
type-check instead of variable check
2016-09-28 18:57:43 -04:00
assembly
Topic UID finishing touches
2016-09-08 13:07:14 -04:00
atmos_automation
UID mass replace: src=\ref[datum]
2016-09-05 23:12:08 -04:00
awaymissions
Announcement fixes, change most command announcements to event announcements
2016-10-25 15:21:16 +02:00
client
Merge pull request #5416 from KasparoVy/tail_markings_mark2
2016-10-23 19:29:54 -04:00
clothing
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
computer3
Fix up a number of ID checks
2016-10-23 15:49:02 +02:00
countdown
Cloning Update
2016-08-31 01:48:02 -04:00
crafting
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
customitems
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
detective_work
…
economy
Fix aliens double attacking, tank examining and ATM security level 0 interaction
2016-10-21 17:21:23 +02:00
error_handler
Integrates UIDs into View Variables
2016-09-08 19:04:50 -04:00
events
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-10-31 14:46:58 +01:00
examine
…
ext_scripts
…
fish
…
flufftext
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
food_and_drinks
oops
2016-10-27 10:44:54 -04:00
garbage_collection
Moves many uses of log_to_dd to log_runtime, to make the output
2016-08-24 09:55:19 -07:00
holiday
…
hydroponics
Merge pull request #5829 from Markolie/plantfix
2016-10-30 22:42:31 -04:00
karma
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
library
Topic UID finishing touches
2016-09-08 13:07:14 -04:00
lighting
…
logic
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
martial_arts
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
mining
Minor wall deconstruction refactor
2016-10-21 17:05:49 +02:00
mob
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
nano
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
ninja
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
paperwork
Announcement fixes, change most command announcements to event announcements
2016-10-25 15:21:16 +02:00
pda
UID mass replace: src=\ref[datum]
2016-09-05 23:12:08 -04:00
persistence
…
pooling
…
power
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
procedural_mapping
…
projectiles
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
reagents
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
recycling
Pressure limit on disposal units
2016-10-22 20:51:49 +02:00
research
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
ruins
…
scripting
…
security_levels
Remove newscast from two missed announcements
2016-10-25 19:50:05 +02:00
shuttle
Announcement fixes, change most command announcements to event announcements
2016-10-25 15:21:16 +02:00
space_management
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_transition_runtime_fix
2016-08-23 13:41:39 -07:00
spacepods
Fix space pod ion damage
2016-10-11 20:41:46 +02:00
store
…
surgery
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
telesci
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
tooltip
…
tram
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
vehicle
…