cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,775 Commits 26 Branches 2 Tags
4cc30536605ba8dcafe31e6a9be9d0e40e6091c8
Commit Graph

477 Commits

Author SHA1 Message Date
Fox McCloud
de0c606969 Merge pull request #13502 from AffectedArc07/hook-kill-v10-final-ultimate-final 
HOOKS ARE DEAD
 2020-07-13 13:55:04 -04:00
Fox McCloud
48fbdda84b Standardizes Holodeck (#13701) 
* Standardizes Holodeck

* fixe and real space

* last errors

* map update

* fix

* console fix

* mapping error
 2020-07-12 14:25:08 -06:00
AffectedArc07
390e41e91d The elephant: Ruin + Whiteship rework (#13632) 
* The elephant: Ruin + Whiteship rework

* ROUND TWO: FIGHT

* Forgot this

* Kyet Fixes

* [NEEDS TESTING] Tweaks from new knowledge

* Adds to Meta, Removes from Delta

* This isnt needed anymore

* Adds in one empty space level

* Area tweaks
 2020-07-12 13:44:58 -06:00
AffectedArc07
014dbd95d9 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-12 09:27:33 +01:00
AffectedArc07
650c638d41 Removes semicolons 2020-07-11 18:51:45 +01:00
AffectedArc07
748b8e88e1 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-02 11:17:30 +01:00
Fox McCloud
4ebc2070e1 Updates Ship Ambience (#13635) 
* Updates Ship Ambience

* derp

* removes traitor.ogg

* remove unused

* leave it in, but don't compile it in

* styling
 2020-06-28 15:18:37 -06:00
AffectedArc07
d8c29ad493 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-06-27 10:10:13 +01:00
AffectedArc07
a237d90f0f Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-06-26 12:30:43 +01:00
Fox McCloud
d09624a1ae Merge remote-tracking branch 'upstream/master' into remove-construction-site 2020-06-23 05:01:38 -04:00
Fox McCloud
c8a7607129 Purges a Bunch of In World Calls (#13641) 
* Purges a Bunch of In World Calls

* tweaks and fixes also typeless lists

* typeless

* fixes

* tweak
 2020-06-22 06:56:19 -06:00
Fox McCloud
602a018bc5 fixes 2020-06-18 11:12:58 -04:00
Fox McCloud
27e709278e Removes Construction Site 2020-06-17 20:43:15 -04:00
AffectedArc07
1676db7924 HOOKS ARE DEAD 2020-05-27 12:00:16 +01:00
AffectedArc07
4e56bfdad0 Fixes this 2020-05-16 15:56:42 +01:00
AffectedArc07
c76ffe6bde Maps stuff back in 2020-05-15 21:43:59 +01:00
joep van der velden
4c0098b9df Makes ai_monitored load the cams on LateInitialize 2020-04-27 21:53:59 +02:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152) 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
 2020-03-20 21:56:37 -06:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud
cc151278d5 Removes Unfinished VR (#12341) 2019-09-20 17:58:41 -07:00
Kyep
dfd83d822a Depot Fixes & Tweaks (#11677) 
* Depot Fixes & Tweaks
 2019-09-16 22:55:54 -04:00
datlo
068b997eb6 Final 
Add cabin area to avoid the alarm locking the entire biodome
Prevent crowbarring lubed tiles in clown planet
Added a few walls to prevent the disposal entrance immediately throwing
you into lava
 2019-08-27 14:34:27 +02:00
Tayyyyyyy
e49d77b953 Update shuttle directions 2019-08-19 21:29:25 -07:00
Tayyyyyyy
4fa093fb2c Improve shuttle parallax stopping 2019-08-19 21:29:13 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
datlo
d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
Kyep
977087a97e fixes merge conflict 2019-08-11 01:36:09 -07:00
joep van der velden
f94fe59f1c specify the rooms to be non cryo. Not brute force it 2019-06-23 19:57:20 +02:00
joep van der velden
8f4379925b blacklist security, logging, Z level, antags blacklist, restrained/unconcious 2019-06-17 23:25:42 +02:00
datlo
8894d88a82 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into lavalandgolemsintospace 2019-06-13 13:58:56 +01:00
Kyep
bde012431f hides attack logs involving NPCs, lavaland, adminroom, thunderdome 2019-06-06 19:46:07 -07:00
Mark van Alphen
e7fa7fed34 Fix the Syndicate base causing atmos alerts 2019-06-03 00:52:14 +02:00
datlo
ade8aeaf2f Allow free golems to purchase shuttle board 
also add a shuttle recalls console to ruin
 2019-06-01 11:51:35 +01:00
datlo
32812736ee Integrate free golems as a lavaland ruin 2019-05-31 09:30:03 +01: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
Fox McCloud
79815eb042 Merge pull request #11357 from Markolie/lighting 
Lighting system update
 2019-05-08 00:27:16 -04:00
AffectedArc07
96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
Mark van Alphen
6d8ec82733 Fix dynamic lighting on shuttles 2019-05-04 05:51:13 +02:00
Mark van Alphen
bdfb4af5c2 Starlight fixes 2019-05-04 03:38:21 +02:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen
35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
EvadableMoxie
5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
 2019-04-30 19:26:17 +02:00
Mark van Alphen
84140d75a0 Merge branch 'lighting' of https://github.com/Markolie/Paradise into lighting 2019-04-30 19:17:41 +02:00
Mark van Alphen
4ad9fd4d18 Correct value 2019-04-30 19:17:34 +02:00
Mark van Alphen
e2cf2782af Re-add fast_despawn 2019-04-30 19:16:44 +02:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined
5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option 
Better SSD management
 2019-04-30 11:29:49 +08:00