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

32465 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
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
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
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
0302a48780 Merge pull request #11521 from Arkatos1/splitfix 
Blob split consciousness fix
 2019-05-23 22:09:45 +08:00
variableundefined
256b4b35ce Merge pull request #11536 from dovydas12345/cryopod 
Fixes some issues with cryopod
 2019-05-23 22:08:16 +08:00
variableundefined
3545a9e75f Merge pull request #11567 from Couls/typo 
Fix typo in scanner code
 2019-05-23 22:07:04 +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
Couls
d0eca96d74 Fix typo in scanner code 2019-05-21 17:19:39 -04:00
Arkatos1
ca708563e5 more fixes 2019-05-20 21:02:53 +02:00
Arkatos1
72abc2665e fixes for cling aug vision and general action buttons 2019-05-20 15:42:20 +02:00
variableundefined
8eddb60313 Merge pull request #11547 from AffectedArc07/prefs-fix 
Re-alphabetises prefs
 2019-05-20 16:00:05 +08:00
Fox McCloud
c31dfee6b1 Merge pull request #11556 from AffectedArc07/var-move 
Moves a global var around
 2019-05-19 16:46:18 -04: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
702a3081d4 Merge pull request #11554 from Arkatos1/swapfix 
Changeling Swap Forms fix
 2019-05-19 16:45:29 -04:00
Fox McCloud
53eca25401 Merge pull request #11551 from Arkatos1/ghostfix 
Ghost vision lighting fix
 2019-05-19 16:43:35 -04:00
AffectedArc07
513c926cb1 Come on you need friends 2019-05-19 20:36:58 +01:00
Arkatos1
69cb37bf22 fixed a case where you could hiss while muzzled 2019-05-19 21:26:47 +02:00
Ty-Omaha
94afabee9c fix2 2019-05-19 15:13:00 -04:00
Ty-Omaha
0a65713126 fix 2019-05-19 14:54:03 -04:00
Arkatos1
bb4ac3d14b swap forms fix 2019-05-19 20:46:27 +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
Citinited
d36cb324a0 Spells now charge using the fast processing subsystem 2019-05-19 18:52:01 +01: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
Dovixx
cb33ec04f8 Fix headpocket being recovered 2019-05-17 21:49:36 +03:00