cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,828 Commits 26 Branches 2 Tags
b65fbb907ea35c693a2ef48aef656a7d043a2e77
Commit Graph

8094 Commits

Author SHA1 Message Date
Mark van Alphen
b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
variableundefined
3acf995a76 Merge pull request #11466 from Markolie/bundles 
Species chameleon fix
 2019-05-28 10:53:17 +08:00
variableundefined
3dae8eded3 Merge pull request #11430 from Markolie/actual_bundles 
[DNM] Uplink bundle rebalance
 2019-05-27 23:05:46 +08:00
variableundefined
f6c9275e24 Merge pull request #11552 from Markolie/gammaborg 
Gamma borgs are now reset when security level is dropped below Gamma
 2019-05-27 18:14:54 +08:00
variableundefined
24b0e5248f Merge pull request #11465 from farie82/handcuff-nodrop-fix 
Can't use cuffs with nodrops now
 2019-05-25 21:01:18 +08:00
Mark van Alphen
ec70c2512d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/masks/breath.dm
#	code/modules/clothing/masks/gasmask.dm
 2019-05-23 18:56:25 +02:00
Mark van Alphen
1a93d05275 Gamma borgs are now reset when security level is dropped below Gamma 2019-05-19 20:04:26 +02:00
Mark van Alphen
2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
variableundefined
3338d8b907 Merge pull request #11476 from Arkatos1/inhand 
New inhand sprites
 2019-05-17 19:17:32 +08:00
Fox McCloud
238780cae6 Merge pull request #11511 from Markolie/lighting 
Make the lighting plane master respect client color and other lighting fixes
 2019-05-15 20:42:44 -04: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
Mark van Alphen
acbf627f8c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/customitems/item_defines.dm
 2019-05-13 22:08:49 +02:00
Mark van Alphen
5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +02:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
AffectedArc07
531201fab4 Merge branch 'master' into hooks-part4 2019-05-08 22:21:12 +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
014d803eba Merge branch 'master' into hooks-part4 2019-05-07 21:22:59 +01:00
AffectedArc07
51998efe56 Fixes #2 2019-05-07 18:01:11 +01:00
Arkatos1
b2e7149f1d Adds new inhand sprites 2019-05-06 16:08:38 +02:00
AffectedArc07
19d8efef68 Morgue Updating [Hooks P4] 2019-05-06 10:08:28 +01:00
AffectedArc07
130b5ef694 Fox fixes. Foxes? 2019-05-06 08:51:44 +01:00
Mark van Alphen
7fb7cdc57f Chair plane fix (and maybe fixes the disappearing humans, too) 2019-05-06 03:52:01 +02:00
AffectedArc07
f2bcd204bc Fixes captains displaycase [Hooks P3] 2019-05-05 22:31:24 +01:00
Mark van Alphen
90f71f164a Remove unused species_fit and move chameleon file 2019-05-05 20:37:53 +02:00
Mark van Alphen
93b45d91c5 Species chameleon fixes 2019-05-05 20:14:34 +02:00
joep van der velden
a015ab755f Cuffs can't be used when you have antidrop on 2019-05-05 13:14:00 +02:00
AffectedArc07
96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01: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
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
variableundefined
8928210da1 Merge pull request #11425 from Arkatos1/delay 
Examine tooltips tweaks
 2019-05-03 22:48:15 +08:00
variableundefined
8a5c4350bc Merge pull request #11431 from Arkatos1/plushies 
Adds 4 new plushies
 2019-05-03 22:42:49 +08:00
variableundefined
44d9f853cb Merge pull request #11418 from Arkatos1/patchpack 
Craftable Patch Pack
 2019-05-03 22:39:26 +08:00
variableundefined
f8d53aed67 Merge pull request #11426 from Arkatos1/toolbelt 
Belt Update
 2019-05-03 22:39:04 +08:00
Mark van Alphen
eac4f841ce Switch to penetrator/sopo rounds only 2019-05-02 01:39:11 +02:00
Mark van Alphen
b3d7681a4a Discord feedback on bundles 2019-05-01 22:24:51 +02:00
Arkatos1
1f2c3819bd Adds 4 new plushies 2019-05-01 21:43:32 +02:00
Mark van Alphen
5216106192 Uplink kit rebalance 2019-05-01 21:35:56 +02:00
Unknown
0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
Mark van Alphen
f7a52dcec0 COMIC injector fix 2019-05-01 21:07:43 +02:00
Mark van Alphen
86b90bab2c And fix the uplink kits 2019-05-01 21:01:16 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Arkatos1
24b0eb0c0c toolbelt update 2019-05-01 16:57:54 +02:00
Arkatos1
c6a91eafdd Tweaks 2019-05-01 16:04:07 +02:00
Arkatos1
791bebf51c Tweaks to Examine tooltips 2019-05-01 15:50:30 +02:00
variableundefined
9d32120975 Merge pull request #11413 from Arkatos1/carp 
Carp Expansion Pack
 2019-05-01 08:50:52 +08:00