cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 22:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

61 Commits

Author SHA1 Message Date
Mark van Alphen
650383aad1 ChangeTurf fix, incinerator starts off by default, Syndicate base fix 2019-06-03 05:53:56 +02:00
Mark van Alphen
bc91f78c93 Shuttle and map fixes 2019-05-08 22:05:11 +02:00
Mark van Alphen
2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
 2019-05-08 21:40:35 +02:00
Mark van Alphen
e9a9326db0 Re-add starlight 2019-05-04 04:22:45 +02:00
Mark van Alphen
7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
Fox McCloud
d88411f947 Merge pull request #11255 from Markolie/safe 
Safe refactor
 2019-04-21 04:04:13 -04:00
Mark van Alphen
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
Mark van Alphen
b98c4dfde0 Fix shuttle plating/propulsion 2019-04-17 23:20:07 +02:00
Mark van Alphen
ca6019fe0a Fix other maps 2019-04-07 00:46:18 +02:00
Mark van Alphen
877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
Mark van Alphen
799f970e7d Map compile fix 2019-04-01 00:26:53 +02:00
Fox McCloud
7d423acc61 Implements Newer Version of Mapmerge 2019-03-17 22:46:24 -04:00
AffectedArc07
433a22bb81 Mapmerge2-2 2019-03-03 01:02:32 +00:00
Unknown
5ab0af3b25 Medical QoL PR 2019-02-15 00:10:08 -05:00
Kyep
a23c55a541 Eliminates 'range' var from door_controls, uses tags/zlevel instead 2019-01-29 18:13:23 -08:00
datlo
46d92d2b86 Add the SIT and SST shuttle and docks to delta 2019-01-22 07:16:08 +00:00
datlo
61c0f71cce Replaces uplink management by automated sharing 
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
 2019-01-03 16:29:31 +00:00
Kyep
b139af2bdd v1 2018-11-23 20:08:49 -08:00
Jazz23
a00e6c5ec2 Loads of fixes 2018-11-15 21:51:58 -08:00
warior4356
36f36b987b Map fixed. Probably. I think. 2018-11-09 00:54:25 -08:00
warior4356
9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
warior4356
2b44f49765 Conflicts fixed 2018-11-08 01:13:24 -08:00
tigercat2000
a38cab96fe Merge pull request #10076 from variableundefined/Addcards 
Add baycards to maps, loadouts & prize.
 2018-11-07 22:53:29 -08:00
Gwydion Brain
cdcf484cbe toxins unsimulations 2018-11-04 13:25:17 -08:00
Gwydion Brain
26d9099c00 ERT Unsims fixerino 2018-11-04 13:14:27 -08:00
Gwydion Brain
e34ec26c2d Initial Commit 2018-11-04 13:03:02 -08:00
warior4356
f7d1c55ea2 Mapping done (again) 2018-11-02 00:33:57 -07:00
warior4356
0ee51bdcc2 Reverts maps. Fixes conflict. 2018-10-31 19:13:22 -07:00
variableundefined
9baf91fdfe Add baycard to map, loadout & datum. Replacing normal non-syndicate cards with them. 2018-10-31 17:12:43 +08:00
warior4356
5f74e61731 Map changes, bug fixes 2018-10-29 03:21:52 -07:00
Unknown
1cd8d2f98f Surgical Trays 
Adds Surgical Trays
 2018-10-22 17:37:51 -04:00
Purpose
7ec2bd3be2 delta grime / dirt 2018-10-11 22:52:34 +01:00
variableundefined
688794b532 Merge pull request #9808 from Citinited/brexiteer's-autopsy-drawer 
Fixes THE MOST IMPORTANT BUG (autopsy reports description)
 2018-10-11 09:16:57 +08:00
Citinited
b2e96508b1 Replaces mapedited autopsy cabinets with their actual path 2018-10-10 23:15:48 +01:00
Citinited
983380c229 Mapedits conveyors on deltastation 2018-10-08 20:28:05 +01:00
Purpose
0bdf4408ce a few more /item/.... 2018-10-06 16:42:05 +01:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Purpose
7e5bec2c89 do they have to be a thing? 2018-10-04 16:15:58 +01:00
Purpose
f2f2c0bebf a few more fixes 2018-10-04 13:06:46 +01:00
Purpose
e4fda987dc fixes 
SM emitter wiring tweaked
atmos gets a multi-tool
atmos now have access to external airlock in atmos
atmos now have access to EVA jetpack storage
atmos now has an additional void suit
fixed disposal network throwing junk into atmos office
space loop lengthened
anchored the supermatter (although it was great to watch it be thrown at
a vox)
added 2 more engineering void suits into the secure storage area,
although think I'd prefer less engineers in void suits... ;)
Atmos airlock now has the correct equipment to cycle
Atmos now have control over the gas mix & air mix tanks
disposals is actually completed now....
#9690
#9689 - medbay front door opens with the button now....
#9687 - random blood for patient rooms
#9686 - fixes no coroner spawn
#9685 - doctors are no longer prisoners, sadly
#9684 - adds the buttons to the door in the perma airlock
#9683 - adds artvends
#9682 - yellow wardrobez
#9681 - adds nullrod & shard for chaplain
#9680 - mechanic gets a fuel depo....
 2018-10-04 11:52:46 +01:00
variableundefined
5f55a8a252 Remove canvas from Delta to prevent Travis disaster 2018-10-02 09:55:22 +08:00
Purpose
3c4ecb99dc Fixes the last of the camera definitions I think.... 2018-09-23 22:57:22 +01:00
Purpose
62ddad2c7f A number of fixes + Adds the NanoUI Map 2018-09-23 21:40:20 +01:00
Purpose
41c74afd79 Atmos fixes & shuttle fixes 2018-09-23 15:37:38 +01:00
Purpose
7770f72264 Updates Delta to account for #8983 - Fuck you Freestyla 
I mean you're right, this is better, but still fuck you
 2018-09-23 14:22:58 +01:00
Purpose
55685d8557 Final issues 2018-09-22 18:23:47 +01:00
Purpose
517f58f266 Some more fixes 2018-09-22 18:05:13 +01:00
Purpose
7571e8c45b And now #8901 2018-09-22 17:43:20 +01:00
Purpose
5c578a58de Accounts for #8550 now too.... 2018-09-22 17:36:37 +01:00
Purpose
84b981b1df Updates for #8424 2018-09-22 17:22:30 +01:00