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

281 Commits

Author SHA1 Message Date
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
Couls
883594178b Objective handling, Species now properly saved, new zombie language only fellow zombies can understand 2019-05-17 14:43:24 -04: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
Mark van Alphen
4c99f3913b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-05-03 20:31:41 +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
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
variableundefined
b9acfe067d Merge pull request #11434 from TDSSS/sst-typo 
fixed typo in sst console
 2019-05-03 22:43:35 +08: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
TDSSS
93d6d7fd7b fixed typo 2019-05-02 05:32:05 +02:00
Mark van Alphen
ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-04-24 02:55:32 +02:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01: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
f0dab66ebc Further turf updates, add Necropolis/boss turfs 2019-03-30 01:24:03 +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
variableundefined
682e7b453e Merge pull request #10948 from datlo/hijackprisonners 
Allow hijackers to take hostages
 2019-03-03 22:37:48 +08:00
datlo
8ec8081fcf removed commented code 2019-02-26 00:34:31 +00:00
datlo
24ef06d249 Allow hijackers to take hostages 2019-02-25 14:29:58 +00:00
datlo
abdf1128cb restrict ERT shuttle to station zlevel 2019-02-11 17:06:49 +00:00
datlo
cb6230f332 add ERT docker, map in changes 2019-02-11 16:58:24 +00:00
datlo
420eb1a51b fix camera being stuck in your shuttle 2019-02-11 14:15:39 +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
3c42aa093f prevent navconsole from spying inside the station 2019-02-07 00:42:09 +00:00
datlo
e27e334b91 add sprites by Ionward 2019-02-06 21:20:40 +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
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
void*
8b8cfdaadb Reworked discord interface to replace the IRC one completely 2019-01-06 18:00:28 +01:00