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
0eeefda271a026d5e88365ff0b4a6195a5a38cfb
Paradise/code/modules
History
Birdtalon 0eeefda271 Merge branch 'master' into set_species 
# Conflicts:
#	code/game/gamemodes/changeling/powers/transform.dm
2018-10-05 23:41:34 +01:00
..
admin
Merge pull request #9419 from Birdtalon/ticketrefactor
2018-10-01 16:20:46 +08:00
alarm
…
antagonists
…
arcade
Merge pull request #9393 from Tails2091/TempClaw
2018-10-02 13:33:54 +08:00
assembly
…
atmos_automation
…
awaymissions
Port of TG ghost role spawner and Corpse Landmark refactor (#8211)
2018-10-03 11:31:55 +08:00
busy_space
…
client
Merge pull request #9505 from Tails2091/KarmaKCleanup
2018-09-29 09:33:24 +08:00
clothing
Merge pull request #9646 from Kurgis/Chief-Engineer-Jumpsuit-InHands
2018-10-01 21:53:28 +08:00
countdown
…
crafting
…
customitems
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into FlagBearerFluff
2018-09-29 23:30:04 -04:00
detective_work
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
economy
updates vars to use the defines
2018-09-16 01:22:57 +01:00
error_handler
…
events
Blob fixes, including fixes #9365
2018-09-04 19:44:14 -07:00
examine
…
ext_scripts
…
fancytitle
…
fish
…
flufftext
Merge pull request #9400 from Tails2091/Hallucination-Refactor
2018-09-28 09:10:46 +08:00
food_and_drinks
Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
2018-09-27 21:47:04 +08:00
games
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
holiday
…
hydroponics
Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
2018-09-27 21:47:04 +08:00
karma
Squashed Query Error Logging To Single Proc
2018-09-28 15:49:30 -04:00
library
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
lighting
…
logic
…
map_fluff
Adds the Air Traffic Control stuff from #7776
2018-09-22 16:09:17 +01:00
martial_arts
Clean up some grabs
2018-09-16 12:28:39 -07:00
mining
Merge pull request #9477 from variableundefined/SSPortShuttle
2018-10-01 01:13:42 -07:00
mob
Merge branch 'master' into set_species
2018-10-05 23:41:34 +01:00
modular_computers
Merge pull request #9476 from variableundefined/SSNanoMob
2018-10-01 01:13:58 -07:00
nano
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
ninja
Clean up some grabs
2018-09-16 12:28:39 -07:00
paperwork
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
pda
Merge pull request #9476 from variableundefined/SSNanoMob
2018-10-01 01:13:58 -07:00
persistence
…
power
Merge pull request #9477 from variableundefined/SSPortShuttle
2018-10-01 01:13:42 -07:00
procedural_mapping
…
projectiles
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
reagents
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
recycling
Merge pull request #9616 from farie82/Disposals-Pipe-Fix
2018-10-01 16:21:11 +08:00
research
Fixed data management screen, research deletion.
2018-09-30 15:13:05 +02:00
ruins
…
scripting
Update Telecomms.dm
2018-09-08 21:27:32 +01:00
security_levels
Merge pull request #9477 from variableundefined/SSPortShuttle
2018-10-01 01:13:42 -07:00
shuttle
Update README.md properly
2018-09-04 15:15:38 +08:00
space_management
…
spacepods
…
station_goals
Merge pull request #9477 from variableundefined/SSPortShuttle
2018-10-01 01:13:42 -07:00
store
…
surgery
Removed the comment
2018-10-03 22:45:13 +02:00
telesci
makes you able to break down bluespace polycrystals in space§
2018-10-01 09:57:09 +02:00
tooltip
…
tram
…
vehicle
…
vr
…