cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,933 Commits 26 Branches 2 Tags
efcdb7fb56ac6f3e701b3ff5cc201ca894151bd8
Commit Graph

17077 Commits

Author SHA1 Message Date
Mark van Alphen
5f33ae47fa Singularity on Lavaland improvements 2019-06-03 23:38:18 +02:00
Mark van Alphen
950a4cb5dc More portal fixes 2019-06-03 21:57:00 +02:00
Mark van Alphen
cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02:00
Mark van Alphen
94eb652f15 Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix 2019-06-03 17:39:23 +02:00
Mark van Alphen
264f019658 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swarmerfix 2019-06-03 16:50:42 +02:00
Mark van Alphen
9f8c0c2939 Stops swarmers from getting stuck on effects 2019-06-03 06:39:36 +02:00
Mark van Alphen
650383aad1 ChangeTurf fix, incinerator starts off by default, Syndicate base fix 2019-06-03 05:53:56 +02:00
Crazy Lemon
1f72ba4102 Merge pull request #11659 from Markolie/turfs 
ChangeTurf icon fix
 2019-06-02 19:19:28 -07:00
Mark van Alphen
2c4c378775 ChangeTurf icon fix 2019-06-03 03:25:48 +02:00
Crazy Lemon
1988ae34d8 Merge pull request #11643 from Markolie/turfs 
Lavaland fixes, continued
 2019-06-02 17:58:56 -07:00
Mark van Alphen
6aba8f9e52 Address comments 2019-06-03 02:40:30 +02:00
Mark van Alphen
8822887784 Compile fix and asteroid turf placement fix 2019-06-03 01:21:03 +02:00
Crazy Lemon
d94906e19a Merge pull request #11656 from Markolie/multiplier 
Fixes an exploit with the sheet multiplier
 2019-06-02 15:52:37 -07:00
Mark van Alphen
e7fa7fed34 Fix the Syndicate base causing atmos alerts 2019-06-03 00:52:14 +02:00
Mark van Alphen
c6e6c6cefd Even better water handling 2019-06-03 00:31:03 +02:00
Crazy Lemon
f2651d43b1 Merge pull request #11421 from Arkatos1/WizardRevenge 
Wizard Update - Revenge of the Federation
 2019-06-02 15:27:42 -07:00
Mark van Alphen
2c7e8ec505 Actually make the ancient goliath able to spawn 2019-06-03 00:27:11 +02:00
Mark van Alphen
8a70f6aa65 Sheet multiplier exploit fix 2019-06-03 00:16:39 +02:00
Mark van Alphen
fd8a9e4909 Water handling improvement 2019-06-03 00:06:29 +02:00
Mark van Alphen
697bb8eee5 More Lavaland fixes: 
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
 2019-06-02 23:29:50 +02:00
Mark van Alphen
7b292677ed Fix Syndicate alarm access 2019-06-02 05:55:21 +02:00
Mark van Alphen
c97506d898 Add coated walls to the turbine in the Syndicate base 2019-06-02 05:45:26 +02:00
Mark van Alphen
4c40df0895 Goliath code update 2019-06-02 05:03:38 +02:00
Mark van Alphen
8f26d19085 Fix stuck swarmers 2019-06-02 04:34:52 +02:00
Mark van Alphen
a2a95383a8 Add some extra offstation checks 2019-06-02 03:24:38 +02:00
Crazy Lemon
c9db490f2b Merge pull request #11630 from Markolie/whatareyousinkingabout 
More Lavaland fixes
 2019-06-01 12:55:57 -07:00
Mark van Alphen
c9e87f6593 Add more explosive power to Syndicate base, add species specific sprites for explorer equipment (thanks Ionward), fix Drake explosive sound, clarify ash walker/syndicate base personnel flavor text 2019-06-01 21:17:17 +02:00
Mark van Alphen
d384c42354 Fix Lavaland swarmers 2019-06-01 05:05:11 +02:00
Mark van Alphen
f60b3fcb5e Lavaland ruin updates 2019-06-01 00:03:56 +02:00
Crazy Lemon
2d0bd13ef7 Merge pull request #11482 from TDSSS/sling-improv 
Slightly easier Sling glare targetting
 2019-05-31 14:58:31 -07:00
Mark van Alphen
26a7a7a029 Lava staff fixes 2019-05-31 21:57:50 +02:00
variableundefined
fac6814a8a Merge pull request #11620 from Citinited/fix-conveyors 
Fixes speed and normal process switching being broken
 2019-05-31 16:12:03 +08:00
Mark van Alphen
58427ab097 Make sure engine floors don't expose space, remove separate Lavaland vendor and add more voucher kits 2019-05-31 05:45:37 +02: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
Citinited
c2f361e1ac Fixes speed and normal process switching being broken 2019-05-30 20:13:09 +01:00
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
86ecd0f8b0 Merge pull request #11584 from Markolie/ghastlytransition 
Re-add ghost space transitions, add ghost-z level tracking
 2019-05-28 11:28:34 +08: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
e8d13fec44 Merge pull request #11524 from Fox-McCloud/the-end 
The End
 2019-05-27 19:45:51 +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
variableundefined
e333d765e3 Merge pull request #11444 from Kyep/throw_at_runtime 
Fixes throw_at runtime in vending machines
 2019-05-25 21:00:51 +08:00
Arkatos1
c55888ac94 fixes the root cause 2019-05-24 14:41:27 +02:00
Arkatos1
0a67689582 the actual fix 2019-05-24 03:40:19 +02:00
Arkatos1
4ff9f25e5e initial commit 2019-05-24 00:53:02 +02:00
Mark van Alphen
8fed0ac75c Re-add ghost space transitions, add ghost z level registering 2019-05-23 19:35:35 +02:00
Mark van Alphen
ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
 2019-05-23 19:04:09 +02: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
variableundefined
17bbe5659c Merge pull request #11520 from Citinited/spooky-apcs 
Boo affects APCs (again) & no more infinite Boo
 2019-05-23 23:49:47 +08:00