cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 09:38:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
11906 Commits
Author SHA1 Message Date
denghis1 451f1548a9 Made warning cones craftable 
Added warning cones to the global plastic_recipies list, this makes them craftable in-game.
 2020-09-01 15:54:29 +02:00
variableundefinedandGitHub c8c1800b57 Merge pull request #13943 from AffectedArc07/more-tcomms-tweaks 
*more* Tcomms Tweaks
 2020-08-31 16:05:05 -04:00
Kugamo da45849334 splits up if statement into multiple lines 2020-08-30 15:43:23 -05:00
AffectedArc07 9b7ed430b3 Merge remote-tracking branch 'ParadiseSS13/master' into removes-red-cross 2020-08-30 08:46:30 +01:00
Kugamo c340e71999 ok this is the best solution 
A single if statement, how elegant
 2020-08-29 19:07:55 -05:00
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
variableundefinedandGitHub 5d0b64b0c9 Merge pull request #14087 from AffectedArc07/removes-butterfly-crate 
Nerfs butterfly crate
 2020-08-28 14:16:58 -04:00
AffectedArc07andGitHub 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
SteelSlayer 6e641db3fe Merge remote-tracking branch 'upstream/master' into internals-auto-push-up 2020-08-25 16:39:08 -05:00
SteelSlayer 1b9ef55246 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-25 16:36:13 -05:00
AffectedArc07andGitHub 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
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
AffectedArc07andGitHub 3fb3353bc8 Merge pull request #14068 from ExusA/Spray-Fix 
Hydroponics Spray Fix
 2020-08-19 11:18:33 +01:00
ExusAGitHubAffectedArc07
 		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
AffectedArc07andGitHub 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
AffectedArc07andGitHub 5037e43341 Merge pull request #14073 from ExusA/toy-descs 
Adds Figurine Descriptions
 2020-08-18 13:01:34 +01:00
AffectedArc07andGitHub 233c60058d Merge pull request #13710 from dearmochi/overhaul-event-mob-selection 
Overhaul event mob selection
 2020-08-18 10:55:24 +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
Kyep e3b82a70a3 Replaces skills computer with skills HUD eyewear 2020-08-17 06:02:55 -07:00
AffectedArc07andGitHub 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
AffectedArc07andGitHub 2d1ba4ab56 Merge pull request #14005 from dearmochi/baton-refactor 
Telebaton fix, refactor and documentation
 2020-08-16 20:08:33 +01:00
AffectedArc07andGitHub 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
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
AffectedArc07andGitHub 07301da5d2 Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob 
ID Computer Demotion/Termination Upgrades
 2020-08-16 13:14:42 +01:00
Kugamo 40f5e0ecd6 references the new sprites 2020-08-15 23:07:10 -05:00
Kugamo d7a479e879 Adds many inhand sprites for cigpacks and animates lighers 2020-08-15 23:06:37 -05:00
AffectedArc07 1506653349 Deletes butterfly crate 2020-08-15 22:42:39 +01:00
SteelSlayer 609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
ExusA abbb1e05fb Update toys.dm 2020-08-13 16:16:36 +08:00
ExusA addb0c1a26 Update belt.dm 2020-08-13 15:00:49 +08:00
ExusAandGitHub f61d92ef0e Merge branch 'master' into Spray-Fix 2020-08-13 14:46:16 +08:00
ExusA 0f95e7308f Revert "Fixes hydro sprays" 
This reverts commit 266939684f.
 2020-08-12 23:21:20 +08:00
ExusA ee65493c3f Update sheet_types.dm 2020-08-12 23:20:48 +08:00
ExusA 51c63c64c3 Update belt.dm 2020-08-12 20:17:21 +08:00
ExusA 266939684f Fixes hydro sprays 2020-08-12 20:09:53 +08:00
mochi 96bf4396a0 Merge branch 'master' into overhaul-event-mob-selection 2020-08-12 01:22:52 +02:00
AffectedArc07andGitHub 09ef06a7ec Merge pull request #13896 from Kyep/sleeper_teleport_fix 
Fixes issues with machines/mechs when a person is teleported out of them
 2020-08-11 14:29:41 +01:00
Kyep 4bad89e37f AA requests 2020-08-11 05:19:48 -07:00
Kyep e86ae71861 tweaks window height 2020-08-11 05:01:09 -07:00
Kyep 0652f9f9af TGUI Tank Transfer Valves (TTV) 2020-08-11 04:54:35 -07:00
SabreML 8b55cd9965 Review tweaks 2020-08-11 10:10:19 +01:00