cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 09:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,855 Commits 26 Branches 2 Tags
0617cad2871ca5decb51b28433e19faea824c381
Commit Graph

11882 Commits

Author SHA1 Message Date
TheDZD
0617cad287 Merge pull request #4944 from Fox-McCloud/cursed-heart 
Ports TG's Cursed Hearts
 2016-07-09 21:02:31 -04:00
Fox McCloud
88a0482d27 Merge pull request #4688 from FreeStylaLT/maintgoodies 
Adds a bunch of items to maint, Syndicate contraband included, tweaks probabilities.
 2016-07-09 20:51:40 -04:00
FreeStylaLT
2140d9168a removes dank trays from list 2016-07-10 03:40:05 +03:00
Fox McCloud
a8d010360c Merge pull request #4946 from TullyBurnalot/RevenantFix 
Revenant Death Fix
 2016-07-09 18:31:39 -04:00
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions 
Hit reactions
 2016-07-09 18:30:37 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets 
The Honkening
 2016-07-09 18:29:11 -04:00
Fox-McCloud
6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
TullyBurnalot
9775cf9ec4 Revenants can die now 
- Removed "You can't die if you just died" insanity
 2016-07-09 03:49:47 +01:00
Fox McCloud
d9c86e24ed Merge pull request #4922 from FalseIncarnate/kitchen 
Buildable Deep Fryers
 2016-07-08 21:19:02 -04:00
Fox-McCloud
9544d8409f Ports TG's Curesed Hearts 2016-07-08 20:51:08 -04:00
Fox McCloud
33c4d852f8 Merge pull request #4904 from TullyBurnalot/CardboardCoffins 
Resisting out of cardboard boxes is now possible
 2016-07-08 18:24:18 -04:00
Fox McCloud
c07a4e7c7e Merge pull request #4919 from Krausus/AltAppearanceFixes 
Alternate Appearance Fixes
 2016-07-08 18:02:01 -04:00
Fox McCloud
4f8de18cb9 Merge pull request #4936 from Twinmold93/materialconsistencies 
Grille  Inconsistency Fix
 2016-07-08 17:59:23 -04:00
Fox McCloud
4897a52dc5 Merge pull request #4926 from TullyBurnalot/ComfyChair 
Fixes Comfy Chair Deconstruction
 2016-07-08 13:14:51 -04:00
TullyBurnalot
e0118efead Fixed Fox's suggestion 
- Removed needless code
 2016-07-08 12:03:38 +01:00
Twinmold
cd7ffd058b Grille Inconsistency Fix 
This fixes an inconsistency when you use wirecutters on a destroyed
grille. Instead of giving 1 like it should, it gives two.

🆑 Twinmold
Fix: Fixes the inconsistency of getting 2 metal rods when you wirecutter
a destroyed grille down to 1.
/🆑
 2016-07-08 03:29:16 -05:00
FalseIncarnate
2b77c45694 Merge conflict fix 2016-07-08 00:46:46 -04:00
Fox-McCloud
2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox McCloud
277c3216d1 Merge pull request #4797 from TheDZD/GENETICS-PLAYER-ANGRY-GENTICS-PLAYER-SMASH!!! 
Re-Adds Instability
 2016-07-07 22:26:58 -04:00
Fox McCloud
d0687d3354 Merge pull request #4907 from TullyBurnalot/BotanistAccess 
Revoked Botanist Access to Morgue
 2016-07-07 22:14:56 -04:00
TullyBurnalot
0b94dc3a54 Fied Tiger's recommendations 
- Removed needles src. Again.
- Replaced  istype(W, /obj/item/weapon/wrench) with iswrench(W)
 2016-07-08 03:03:37 +01:00
TullyBurnalot
adab2c06e0 Fixes Comfy Chair Deconstruction 
- Deconstructing Comfy Chairs now yields 2 metal sheets
 2016-07-08 02:49:15 +01:00
TheDZD
52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
FalseIncarnate
adbc85a56b Buildable Deep Fryers 
Deep fryers can now be built and upgraded with some minor assistance
from science.
- Board requires programming 2, just like the microwave and such
- 2 micro lasers + 5 cables
- Upgrading the lasers decreases the cook time

🆑
rscadd: Deepfryers are no longer arcane mysteries, and can be
(de)constructed and upgraded.
/🆑
 2016-07-07 18:47:56 -04:00
TheDZD
46c86b6bbc Merge pull request #4906 from TullyBurnalot/BananiumDoors 
Fixes Clown and Mime Doors
 2016-07-07 16:47:31 -04:00
TheDZD
3a96f691e6 Merge pull request #4910 from Krausus/bicon-photos 
Replaces File-Based ID Photos With Bicons
 2016-07-07 16:46:58 -04:00
Krausus
147d485cb3 Fixes alternate appearance clobbering 2016-07-07 16:25:46 -04:00
Krausus
d6dd9075f3 Fixes agent ID HTML not updating 2016-07-07 10:21:58 -04:00
Kyep
5454011593 Fixes trialmin bug, adds ERT response reminder 2016-07-06 23:47:08 -07:00
Krausus
783536d278 Replaces ID photos with bicons 2016-07-07 01:25:56 -04:00
TullyBurnalot
e195b07eee Revoked Botanist Access to Morgue 
- Botanists were given access to the Morgue because of Replicant Pods
- Replicant pods no longer work as a cloning method
- Ergo, botanists outta the morgue

🆑
remove: Botanist access to the morgue revoked
/🆑
 2016-07-07 02:53:27 +01:00
TheDZD
2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04:00
TullyBurnalot
a1e84818aa Removes Borg/AI IV Drip access entirely 
Neither AIs nor Cyborgs can remove beakers from IV Drips.
 2016-07-06 23:21:32 +01:00
TullyBurnalot
092e424175 Fixed Mime Doors 
It's not Tranquilite.

It's not Tranqillite.

It's Tranquillite.
 2016-07-06 23:08:26 +01:00
TullyBurnalot
336d2eb791 Fixed Clown/Mime Door Deconstruction 
Fixes #4689

- Deconstructing Clown Doors now gives Bananiums
- Deconstructing Mime Doors now gives Tranquilite
- Invisibility drives installed

🆑
tweak: Deconstructing Clown Doors gives Bananium
tweat: Deconstructing Mime Doors gives Tranquilite
 2016-07-06 22:21:47 +01:00
TullyBurnalot
9793fc4b18 Resisting out of unwelded lockers is now possible 
Fixes #4880. Sorta.

- Can now resist out of unwelded lockers instantaneously
- By association, can now resist out of closed cardboard boxes

You can also use Toggle Open, this is just faster.
 2016-07-06 21:22:28 +01:00
TullyBurnalot
34a6960ef1 Removes 2 extra parenthesis 
What the title says.
 2016-07-06 19:50:47 +01:00
TullyBurnalot
c335840cfd Fixes AIs removing beakers from IV Drips 
Thanks to Krausus for the general idea on how to do this without adding
an exception just for the AI.

- AIs can no longer interact with IV Drips (unless their core is
literally adjacent to it);
- Human mobs and Robotics can still interact with IV Drips (robots can
no longer interact with them at a distance

🆑
tweak: AI can no longer interact with IV Drips at a distance
tweak: Robots can no longer interact with IV Drips at a distance
/🆑
 2016-07-06 19:40:56 +01:00
Fox McCloud
7f5c764516 Merge pull request #4896 from Krausus/RuntimeFixes-20160705181950 
Runtime Fixes
 2016-07-05 23:45:15 -04:00
Krausus
b37cecbeae Fixes various runtimes (squashed) 
- Fixes runtime in pod lock busters
- Fixes possessed object examination runtime
- Fixes runtime when following a destroyed mob
- Fixes to_chat runtimes from involuntary emotes
- Fixes runtimes from invalid clothing IDs
- Fixes runtime caused by wirecutting non-humans
- Fixes runtime when setting up malf AI antaghuds
- Fixes runtimes in sensory destruction reagents
- Fixes runtime caused by clientless ghosts
- Fixes antag hud runtime in autotraitor generation
- Fixes welding tool shutoff runtime
- Fixes runtime in laptops' welcome program
- Fixes to_chat runtime from mech sound effect
- Fixes runtimes in camera-using NanoUIs
- Fixes to_chat runtimes in resisting held mobs
- Fixes headless mob skeletonizing/husking runtimes
- Fixes non-mob add_logs runtime
 2016-07-05 23:30:01 -04:00
KasparoVy
55b138ff57 kill more conflicts. 2016-07-05 21:48:27 -04:00
Fox McCloud
ef49dcc938 Merge pull request #4879 from TullyBurnalot/JaniSlots 
Makes Janitors a 1-Slot Job Again
 2016-07-05 21:00:54 -04:00
TheDZD
1a898dfd37 Merge pull request #4852 from FalseIncarnate/bug_fix 
Minor Bug / Exploit Fixes
 2016-07-05 20:41:47 -04:00
Fox McCloud
df0c9e51cf Merge pull request #4870 from Kyep/specops_fix 
Fixes NTSpecOps Radios
 2016-07-05 20:00:21 -04:00
TheDZD
412d4cf501 Merge pull request #4866 from Fox-McCloud/flag-change 
Minor Flag Refactor
 2016-07-05 19:47:16 -04:00
Fox McCloud
fc54dd0dc7 Merge pull request #4862 from LittleBigKid2000/janiborg-enhancements 
Changes the janiborg's mop into an advanced mop
 2016-07-05 19:40:25 -04:00
TheDZD
82afdde2f6 Merge pull request #4857 from Fox-McCloud/lube-nerf 
Nerfs Space Lube
 2016-07-05 19:06:18 -04:00
TheDZD
9aeaeef3f8 Merge pull request #4882 from Fox-McCloud/fast-get-turf 
Faster Get Turf from VG
 2016-07-05 11:36:17 -04:00