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

20077 Commits

Author SHA1 Message Date
Mark van Alphen
eec0d30e85 Variable fix 2019-05-31 05:47:20 +02: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
48cf33e53d Fix Syndicate base humans not spawning with pistols 2019-05-31 05:07:58 +02:00
Mark van Alphen
78513251c8 Fix cutting explorer boots and Donksoft vendor access 2019-05-31 04:48:02 +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
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
e75fd0d373 Merge pull request #11537 from Arkatos1/smartvisual 
Smartfridge gets smarter Mk.2
 2019-05-27 19:49:52 +08:00
variableundefined
e8d13fec44 Merge pull request #11524 from Fox-McCloud/the-end 
The End
 2019-05-27 19:45:51 +08:00
variableundefined
0e9c022c36 Merge pull request #11553 from Ty-Omaha/color 
Better adminhelp take ticket color
 2019-05-27 18:15:56 +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
Couls
b138ef11f5 Update mouse.dm 
player-controlled mice no longer randomly go unconscious
 2019-05-26 22:00:26 -04: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
406ec6f4f1 Merge pull request #11518 from farie82/can_equip-fix 
Fixes can_equip and refactors it
 2019-05-23 23:50:29 +08: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
variableundefined
88d1a8fb7c Merge pull request #11573 from Shadeykins/Gasmask-Pixel 
Fixes Plasmaman mask pixel clipping
 2019-05-23 22:06:04 +08:00
Shadeykins
b7fdc55beb Fixes Plasmaman mask pixel clipping 2019-05-22 06:52:36 -06:00
variableundefined
8eddb60313 Merge pull request #11547 from AffectedArc07/prefs-fix 
Re-alphabetises prefs
 2019-05-20 16:00:05 +08:00
Fox McCloud
9f9d13dbd0 Merge pull request #11555 from Arkatos1/hissfix 
You can no longer hiss while muzzled
 2019-05-19 16:45:55 -04:00
Fox McCloud
53eca25401 Merge pull request #11551 from Arkatos1/ghostfix 
Ghost vision lighting fix
 2019-05-19 16:43:35 -04:00
Arkatos1
69cb37bf22 fixed a case where you could hiss while muzzled 2019-05-19 21:26:47 +02:00
Ty-Omaha
0e3645a27d taketickets 2019-05-19 14:24:12 -04:00
Mark van Alphen
1b14f705e0 Add crisis check 2019-05-19 20:08:19 +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
Arkatos1
d2f50269d7 fixed ghost vision 2019-05-19 19:47:46 +02:00
AffectedArc07
3221827576 Re-alphabetises prefs 2019-05-19 08:11:37 +01:00
Fox McCloud
d61c34e537 Merge pull request #11546 from Shadeykins/Paper-Exploit 
Fixes paper.dm issue
 2019-05-18 16:26:57 -04:00
Fox McCloud
cbe4fe9b2e Merge pull request #11533 from Markolie/lighting 
Rotatium fix
 2019-05-18 15:44:07 -04:00
Shadeykins
7249cd84b5 Word choice. 2019-05-18 13:24:35 -06:00
Shadeykins
69e50ae70b Fixes potential paper exploit. 2019-05-18 13:21:38 -06:00
Citinited
da51a3315c Fix for infinite boo 2019-05-18 13:02:06 +01:00
tayyyyyyy
e288355182 Avoid announcing admin jobs 2019-05-18 02:01:32 -07:00
Arkatos1
15299ce1d0 smartfridge now visually reflect their content 2019-05-17 20:24:11 +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
19c8a8265e Merge pull request #11486 from Tayyyyyyy/better_ert_spawn 
Non-blocking ERT selection/spawn
 2019-05-17 23:07:30 +08:00
variableundefined
41b175f470 Merge pull request #11480 from Tayyyyyyy/messages_window 
Make it easier to slide into DMs
 2019-05-17 19:20:22 +08:00
variableundefined
7076f2718b Merge pull request #11477 from Arkatos1/smartoutput 
Smartfridge gets smarter
 2019-05-17 19:18:01 +08:00
variableundefined
3338d8b907 Merge pull request #11476 from Arkatos1/inhand 
New inhand sprites
 2019-05-17 19:17:32 +08:00
variableundefined
719ffda09e Merge pull request #11438 from Emanthealmighty/AdminCultist-change 
Admin created cultists can now properly summon their Gods.
 2019-05-17 19:15:39 +08:00
variableundefined
1e62ac30ad Merge pull request #11439 from Arkatos1/LingIcons 
Changeling Evolution - Action Buttons!
 2019-05-17 19:15:16 +08:00
Mark van Alphen
4ccf04124c Rotatium fix 2019-05-16 18:50:18 +02: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
330708a578 Fix mining bot mesons 2019-05-15 23:08:24 +02:00
Fox McCloud
68effd9d83 The End 2019-05-13 17:22:57 -04:00