cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 08:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,850 Commits 29 Branches 2 Tags
702fbbfdb3c8cd8579ae9db3916b02cedfd97357
Commit Graph

18433 Commits

Author SHA1 Message Date
Kugamo
702fbbfdb3 this is acutally is a better fix 
my first commit didnt account for the possibility that the revealed item could be destroyed, this way also eliminates another if statement. BUT it still goes through the full cycle for the objects(they still appear translucent for a time)
 2020-08-29 19:03:27 -05:00
Kugamo
811dd2c454 fix 2020-08-29 18:31:21 -05:00
variableundefined
b728a3dc49 Merge pull request #14147 from SabreML/Cling-bugfixes-1 
A couple of cling bodyswap bugfixes
 2020-08-28 19:24:33 -04:00
variableundefined
e494f0ca6b Merge pull request #13884 from AffectedArc07/announcement-topic 
Adds a world/Topic entry for announcing by server
 2020-08-28 14:25:42 -04:00
variableundefined
5d0b64b0c9 Merge pull request #14087 from AffectedArc07/removes-butterfly-crate 
Nerfs butterfly crate
 2020-08-28 14:16:58 -04:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor 
TG Flying+Floating Refactor
 2020-08-27 20:08:35 +01:00
AffectedArc07
04a02eaed4 Merge pull request #14137 from dearmochi/ghost-spawns-fixes 
Adds chat message when polling for candidates, fixes blob offspring alert and preferences being ignored
 2020-08-26 20:38:29 +01:00
AffectedArc07
89f1e9c4a2 Merge pull request #14142 from farie82/recycler-throw-immune 
Gives the recycler a higher damage reflection to avoid it breaking from most trash
 2020-08-26 20:36:20 +01:00
SabreML
acc28f9910 Stops body swap if either side has a borer 2020-08-26 00:30:17 +01:00
SabreML
233fb786e8 Fix swap forms suicide bug 2020-08-25 23:29:06 +01:00
SabreML
1f97e02636 Fix runtime when using swap forms 2020-08-25 23:11:51 +01:00
Qwertytoforty
99f820ac71 0 to none 2020-08-25 13:28:54 -04:00
Qwertytoforty
d0dc907e08 Prevents blob throwing 2020-08-25 12:59:12 -04:00
joep van der velden
2efe73f528 Gives the recycler higher damage deflection 2020-08-25 17:17:49 +02:00
AffectedArc07
ab04cccae1 Merge pull request #14134 from Deelite34/Night-mode-tweak-2 
Dark mode tweaks v1.1
 2020-08-25 12:58:02 +01:00
joep van der velden
127853aedf just ..() 2020-08-24 21:48:57 +02:00
joep van der velden
79119197ca Makes the recycler immune to throwing damage 2020-08-24 21:48:26 +02:00
Deelite34
ba6a83eac2 Darkens ooc colour 2020-08-24 17:01:43 +02:00
AffectedArc07
ac2b14354a Merge pull request #13467 from tinfoiltophat/vendor-fix 
Vendor fix
 2020-08-24 10:50:06 +01:00
AffectedArc07
58e1f0d55c Merge pull request #14030 from SabreML/Tourist-Suit 
Adds the Tourist Outfit as a wearable shirt.
 2020-08-24 10:48:25 +01:00
AffectedArc07
47559cdd64 Merge pull request #14139 from Kyep/fix_14107_spider_factions 
Fixes #14107 - giant spider faction assignment
 2020-08-24 10:15:56 +01:00
Kyep
09d3a44a91 Fixes #14107 - giant spider faction assignment 2020-08-23 23:53:15 -07:00
mochi
a0278345f0 Fix missing poll icons, chage holopara icons 2020-08-24 08:45:20 +02:00
mochi
d060e8bc43 Fix offspring candidacy icon, pref checks and add chat message 2020-08-23 13:26:44 +02:00
Deelite34
e42427865f Brighter ooc colour, mentor slightly brighter to be easier to differentiate from new ooc colour 2020-08-22 23:14:58 +02:00
Deelite34
c04fbd5e4b Fixes what I have missed 
global ooc colour, ert, occurence of "blue" colour
 2020-08-22 23:05:39 +02:00
joep van der velden
55d0dc8003 Fixes the exploit where you can put unlimited items in a locker 2020-08-21 23:55:32 +02:00
AffectedArc07
3fb3353bc8 Merge pull request #14068 from ExusA/Spray-Fix 
Hydroponics Spray Fix
 2020-08-19 11:18:33 +01:00
ExusA
c1756fe7e3 Update code/game/objects/items/weapons/storage/belt.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-08-19 18:09:13 +08:00
AffectedArc07
820d6cf5e4 Merge pull request #14100 from SabreML/Cult-Shield 
Adds a shield overlay to the Empowered Cultist Robes
 2020-08-19 10:47:10 +01:00
AffectedArc07
ce0eb1fbdc Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order 
Fix colored lips drawing over masks and random lipstick colouring
 2020-08-19 10:46:04 +01:00
mochi
346b54ad26 Fix random lipstick colour always defaulting to white 2020-08-19 10:20:14 +02:00
ExusA
9f62b5534b fixes indentation and duplicate code 2020-08-18 22:21:25 +08:00
AffectedArc07
9998f8bd3f Merge pull request #14061 from Kyep/holopara_ranged_attack_speed 
Ranged holoparasites no longer obliterate admin attack logs
 2020-08-18 15:20:03 +01:00
AffectedArc07
5037e43341 Merge pull request #14073 from ExusA/toy-descs 
Adds Figurine Descriptions
 2020-08-18 13:01:34 +01:00
AffectedArc07
233c60058d Merge pull request #13710 from dearmochi/overhaul-event-mob-selection 
Overhaul event mob selection
 2020-08-18 10:55:24 +01:00
AffectedArc07
892793caff Merge pull request #13631 from dearmochi/recharger-tweak-n-refactor 
Recharger tweaks and fixes
 2020-08-18 10:23:32 +01:00
mochi
c1d3d164fa Kyet stuff 2020-08-18 10:28:47 +02:00
joep van der velden
ab853bed7c Merge remote-tracking branch 'upstream/master' into pull-move-rework 2020-08-17 21:35:35 +02:00
SabreML
93102c1a9d Adds shield effect to Shielded Robes 2020-08-17 15:16:41 +01:00
AffectedArc07
69cd58c1df Merge pull request #13934 from SabreML/Maint-Drone-Stuff 
Maintenance Drone Tweaks
 2020-08-17 13:35:59 +01:00
SabreML
de535bba3e Allows Robots to open and close extinguisher cabinets. 2020-08-17 13:15:21 +01:00
AffectedArc07
c9f17cab6c Makes it so 1 butterfly still exists 2020-08-17 11:20:46 +01:00
AffectedArc07
2b48fa853d Revert "Deletes butterfly crate" 
This reverts commit 1506653349.
 2020-08-17 11:19:42 +01:00
AffectedArc07
2d1ba4ab56 Merge pull request #14005 from dearmochi/baton-refactor 
Telebaton fix, refactor and documentation
 2020-08-16 20:08:33 +01:00
AffectedArc07
f65e8f1d7f Merge pull request #13899 from dearmochi/flashbang-light-vfx 
Update flashbang FX and code clean-up
 2020-08-16 20:00:48 +01:00
mochi
8ef5d4070e undef 2020-08-16 20:16:46 +02:00
ExusA
f0dc996149 Update belt.dm 2020-08-16 23:50:30 +08:00
ExusA
9401458416 actually what i meant to submit 2020-08-16 21:53:46 +08:00
AffectedArc07
7f6d077994 Merge pull request #14080 from Kyep/refactor_exp_update 
Playtime DB update call refactor
 2020-08-16 13:49:37 +01:00