cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,489 Commits 26 Branches 2 Tags
96840368d40f49d172cb15c39cc9a9cb8c835615
Commit Graph

131 Commits

Author SHA1 Message Date
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
variableundefined
0cee3ea089 Merge pull request #13636 from Fox-McCloud/remove-construction-site 
Removes Construction Site
 2020-06-27 00:08:49 -04:00
Fox McCloud
b3d69aac9b Moves to BYOND 513 (#13650) 
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
 2020-06-26 01:15:59 -06:00
Fox McCloud
0768415ddc fixes 2020-06-23 04:55:18 -04:00
AffectedArc07
559f907e9c Fixes shuttle exploit 2020-06-15 10:21:48 +01:00
farie82
442ef4811e Improved logging (#13208) 
* Death is logged. hiveminds and robot talk is logged

* Added channels to the say log

* Shuttle logging

* Spell targets logging
 2020-04-09 23:33:53 -06: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
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Couls
15ea543566 Fix shuttle timers 2019-08-27 00:28:10 -04:00
variableundefined
cb3cb84f23 Merge pull request #12037 from Couls/buckle-your-pants 
Mining shuttle launch delay and warning message
 2019-08-25 21:43:17 -04:00
Tayyyyyyy
4fa093fb2c Improve shuttle parallax stopping 2019-08-19 21:29:13 -07:00
Tayyyyyyy
c73f0aafd2 Shuttle parallax! 2019-08-19 18:01:45 -07:00
Couls
f9b03d5d2f Lower the delay to three seconds 2019-08-19 03:42:30 -04:00
Couls
1218c2b811 Mining shuttle launch delay and warning message 2019-08-19 03:27:36 -04:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
datlo
3c38fb0295 add isobserver check on golem console 2019-06-13 14:26:45 +01: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
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
6d8ec82733 Fix dynamic lighting on shuttles 2019-05-04 05:51:13 +02:00
Mark van Alphen
b5c322e00a Starlight/shuttle lighting fix 2019-05-04 04:30:13 +02:00
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-04 03:16:38 +02:00
Mark van Alphen
f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-05-04 03:07:36 +02:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen
ea517f153d Fix the steel_rain runtime again 2019-05-03 20:50:03 +02:00
Fox McCloud
9d4928b37a Merge pull request #11450 from variableundefined/AIOptimization2 
AI Optimization, SNPC Removal 2.0
 2019-05-03 13:30:41 -04: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
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
EvadableMoxie
5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
Mark van Alphen
4c26388a8b Remove white shuttle landing spot 2019-04-17 22:40:08 +02:00
Mark van Alphen
500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02:00
Mark van Alphen
5c1ac0cb82 Add mapload to shuttle computer Initialize 2019-04-01 23:30:40 +02:00
Mark van Alphen
55adce2fb1 Fix code review issues 2019-03-31 22:09:09 +02:00
Mark van Alphen
2047825165 Finish up Lavaland map 2019-03-30 21:08:33 +01:00
Mark van Alphen
1e2ff20683 Resolve startup issues: added missing configs, removed unused configs from example file and fix shuttle warning 2019-03-29 17:09:05 +01:00
datlo
cb6230f332 add ERT docker, map in changes 2019-02-11 16:58:24 +00:00
datlo
2393977c33 moar deconflicting 2019-02-11 13:47:09 +00:00
datlo
c57ec440e1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2 
# Conflicts:
#	code/modules/shuttle/shuttle.dm
 2019-02-11 13:31:37 +00:00
datlo
b27584d6e3 deconflicting 2019-02-11 13:30:39 +00:00
datlo
0805b89ea7 Update access denied message 
the old message would make you think you need a golem id or somethin
 2019-02-07 14:27:38 +00:00
datlo
91ef2d7be2 it's alive 2019-02-06 20:01:30 +00:00
datlo
912c6b0b9e asteroid claim improvements, golem ship security 
Add plating over asteroid tiles if you've claimed them

Asteroid walls can now be used to define rooms (still must be airtight)

Add golem check to the free golem ship
 2019-02-03 15:59:04 +00:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
Kyep
14809873b1 removes docking request system, remaps shuttle, removes offstation docking port 2018-12-08 15:37:53 -08:00