cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 18:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,911 Commits 28 Branches 2 Tags
fa2a72e0eb4d859b92a44bc7be2ca337fe507208
Commit Graph

18465 Commits

Author SHA1 Message Date
Kugamo
fa2a72e0eb Fixes unwrenching bug 2020-09-03 12:36:58 -05:00
AffectedArc07
0ccf04ba23 Merge pull request #14056 from SabreML/Wood-Deconstruction 
Makes more wooden structures deconstructable.
 2020-09-02 11:05:33 +01:00
AffectedArc07
75bbf7a6d5 Merge pull request #14088 from kugamo/Inhand-sprites-for-cigarette-packets 
Inhand sprites for cigarette packets
 2020-09-02 11:04:41 +01:00
AffectedArc07
299583b3e1 Merge pull request #14197 from farie82/mech-hand-attack-notice 
Makes the attack_hand on mechs and borgs less annoying
 2020-09-02 11:01:35 +01:00
AffectedArc07
b00304ebf1 Merge pull request #14209 from denghis1/plastic_create_cone 
Feature: Make warning cone craftable
 2020-09-02 11:00:51 +01:00
AffectedArc07
35682a8e20 Merge pull request #14210 from RedWolfie/crayon 
[Bugfix] Orange cables
 2020-09-02 11:00:23 +01:00
Certhic
916d358ad3 replaced some magic values 2020-09-01 16:26:25 +02:00
Certhic
90ac9874b2 fixed orange crayons not making cables orange 2020-09-01 16:23:53 +02:00
denghis1
7705a8c01a Removed the crafting time of the warning cones 
Removed the crafting time of the warning cones, since it was so low anyway.
 2020-09-01 16:07:49 +02:00
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
AffectedArc07
6770dbf231 Merge pull request #14183 from kugamo/Adds-Flagellant-Rob-Sprites 
Adds flagellant robe sprites
 2020-08-31 23:05:08 +01:00
variableundefined
c8c1800b57 Merge pull request #13943 from AffectedArc07/more-tcomms-tweaks 
*more* Tcomms Tweaks
 2020-08-31 16:05:05 -04:00
AffectedArc07
2d1cc70209 Merge pull request #14189 from kugamo/Fixes-T_scanner-problems 
Fixes T_Scanner visual bug
 2020-08-31 16:42:54 +01:00
Kugamo
da45849334 splits up if statement into multiple lines 2020-08-30 15:43:23 -05:00
joep van der velden
576e2a6f38 Makes the attack_hand on hands less annoying 2020-08-30 21:46:10 +02: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
Certhic
7075229f8b deletes icons/obj/paper.dmi 2020-08-29 22:49:09 +02:00
Kugamo
1ad64c4b3a adds flagellent robe sprites 2020-08-29 08:07:43 -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