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

169 Commits

Author SHA1 Message Date
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
2c1ccf6786 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-05-31 05:48:49 +02:00
Crazy Lemon
8502c44df6 Merge pull request #11359 from Kyep/ipintel 
Adds XKeyScore (from TG), forum link, removes old discord link
 2019-05-30 19:57:18 -07:00
Mark van Alphen
f0734672f3 Lavaland fixes: 
- Survival pod storage being broken when used.
- Wrong wiring on the Syndicate base.
- Added one more oxygen tank to the animal hospital.
- Chasms eating up light atoms.
- Mining satchels not picking up items automatically.
- Releasing the legion/blob mice notifications not having icons.
- Mining gear made orderable at cargo.
 2019-05-31 02:21:37 +02:00
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
Kyep
1b0defba92 fixes merge conflict 2019-05-10 09:56:58 -07:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +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
variableundefined
00207f8d9d Merge pull request #11399 from Kyep/patreon_update 
Patreon Upgrade
 2019-05-06 18:52:50 +08:00
Kyep
0c85b1790c fixes merge conflict in paradise.dme 2019-05-04 22:59:00 -07: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
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08: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
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
KasparoVy
66baa9e41b Adds Eyewear Adjustment: Wearing Over/Under Masks 
Adds a verb that'll let you adjust eyewear to be worn above or below a mask. Purely cosmetic.
 2019-04-30 01:00:24 -04:00
Kyep
78c67b9a1f patreon perks, admins, custom events 2019-04-28 03:40:50 -07:00
Kyep
374f175cdc SQL_VERSION / DB_VERSION 2019-04-22 17:37:10 -07:00
Mark van Alphen
b79d3545e1 Enable viewing own mob in darkness 2019-04-22 23:28:48 +02:00
Mark van Alphen
75b06fe82c Lighting fixes 2019-04-22 21:47:08 +02:00
Mark van Alphen
64f8300c2d Switch to preference toggle for ambient occlusion 2019-04-21 18:11:10 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen
092773132d no_lava fix, make sure simple explosions don't nuke the Syndicate base 2019-04-20 03:09:13 +02:00
Mark van Alphen
246d2099ae Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-04-12 19:44:31 +02:00
Arkatos1
da73c134db Ghosts now orbit their followed targets 2019-04-09 02:17:40 +02:00
Mark van Alphen
99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen
a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Mark van Alphen
f0dab66ebc Further turf updates, add Necropolis/boss turfs 2019-03-30 01:24:03 +01:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
variableundefined
7b5afbadc8 Merge pull request #10838 from Fox-McCloud/defib-nerf 
Reduces Defib Safe Time: Adds Health HUD Defib Indicator
 2019-02-09 13:28:43 +08:00
variableundefined
ce02ed22f6 Merge pull request #10740 from AffectedArc07/discord-link-notify 
Discord linking and roundstart notifications!
 2019-02-09 10:55:20 +08:00
Fox McCloud
dc09d07d86 Reduces Defib Safe Time: Adds Health HUD Defib Indicator 2019-02-07 00:49:24 -05:00
AffectedArc07
3b75eaaba3 Adds a round notify system 2019-01-26 21:23:10 +00:00
datlo
3f2804c8bf adds the grenadier belt and permafrost'd tiles 2018-12-17 11:53:28 +00:00
tigercat2000
e5d1ecb6a4 Merge remote-tracking branch 'upstream/master' into updateicons 2018-11-08 20:24:48 -08:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works 
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
 2018-11-08 20:24:22 -08:00
Purpose
8a6bbd6aad Adds glowsticks 2018-10-20 09:34:45 +01:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Crazylemon64
5b0eedcee5 Refactors buildmode into submodules, and adds an "atmos" buildmode 
Also makes the mode selection interface far less tedious/painful

Adds unsimulated turf overriding, and admin logging

Temporary commit for storing the sdql buildmode

Adds extra documentation

also requires a path to be selected for "advanced" and "fill" modes, now

Spaces out mode switch buttons nicer

removes need for debug rights to do a fill with mob paths

Adds a bunch of extra fancy paths

Fox Changes pt 1

Backports /tg/station changes

Fixes a double-tap issue with dclick handling of certain mobs

Also no longer shows the "selection canceled" if you haven't selected a
region for the buildmode that supports region selection

Updates buildmode stuff
 2018-10-07 20:54:40 -07:00
FreeStylaLT
f78bf99894 updates to temperature_expose 2018-08-09 23:27:25 +03:00
Fox McCloud
4f10f52c7e tweaks 2018-07-27 14:51:04 -04:00
Fox McCloud
fc89432b36 update 2018-07-25 00:31:57 -04:00
Crazy Lemon
abb7fb66aa Merge pull request #9042 from Fox-McCloud/clean-up-attack-things 
Cleans up some Machinery Attackby
 2018-07-11 13:10:26 -07:00
Crazy Lemon
f1fc9375f5 Merge branch 'master' into LabelerLogging 2018-06-30 20:19:53 -07:00
Fox McCloud
38b3a698fe Merge remote-tracking branch 'upstream/master' into clean-up-attack-things 2018-06-25 19:21:57 -04:00