cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,020 Commits 26 Branches 2 Tags
c03aebaed9e2ea534262cadbf55df79ec17ba29b
Commit Graph

5650 Commits

Author SHA1 Message Date
TheDZD
dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks 
Cyborg Upgrade Additions and Refactor
 2016-07-12 21:22:57 -04:00
Fox McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option 
Makes Exile & Lethal Injection Viable
 2016-07-11 21:21:16 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate 
Bureaucracy Update
 2016-07-11 21:20:06 -04:00
TheDZD
66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane 
Nanotrasen Rep Cane Tweak
 2016-07-11 20:59:34 -04:00
TheDZD
ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor 
Blood Refactor+Fixes
 2016-07-11 20:57:25 -04:00
Fox McCloud
374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf 
Fixes pulse shot cost.
 2016-07-11 20:46:22 -04:00
Fox McCloud
595297fb6e Merge pull request #4991 from Krausus/ThereCanOnlyBeOneHookSystem 
Fixes Morgue Updating and Eliminates VG-style Hooks
 2016-07-11 20:41:32 -04:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00
Fox-McCloud
88468d2698 Fixes Borg Stun Arm Bypassing Shields 2016-07-11 10:45:50 -04:00
Fox-McCloud
b7c71c7c76 differences 2016-07-11 09:23:43 -04:00
Fox-McCloud
2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
Fox McCloud
a61a2bdb53 Merge pull request #4973 from monster860/health_scanner_fix 
Fixes health scanner not having closing tag on it
 2016-07-10 15:38:54 -04:00
monster860
3552ed9608 Fixes health scanner not having closing tag on it 2016-07-10 14:38:09 -04:00
TheDZD
a97f0eaeea Merge pull request #4952 from Fox-McCloud/borg-power 
Borg Power Use Refactor
 2016-07-10 14:23:37 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Fox-McCloud
7165360832 Blood Refactor+Fixes 2016-07-10 02:58:00 -04:00
Fox-McCloud
0ef31800b7 whoops 2016-07-09 22:50:05 -04:00
Fox-McCloud
9a8b9a29ee Nanotrasen Rep Cane Tweak 2016-07-09 22:41:46 -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
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions 
Hit reactions
 2016-07-09 18:30:37 -04:00
Fox-McCloud
6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
Fox-McCloud
405df28fab Borg Power Use Refactor 2016-07-09 01:50:26 -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
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
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -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
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
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
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
TullyBurnalot
2dce5ec8f1 Bureaucracy Update 
- Added Fax Guide to NT Rep, IAA, Captain, HoS and HoP Lockers
- Added Tape Box, with 6 Tapes, to NT Rep and IAA Office
- Added Recorder to NT Rep Locker
- Printers now start off with 60 toner
- Printers now alert nearby people when butts are copied
 2016-07-07 20:24:07 +01:00
Krausus
d6dd9075f3 Fixes agent ID HTML not updating 2016-07-07 10:21:58 -04:00
Kyep
de77c072fb Makes capital crime options consistent 2016-07-06 23:13:56 -07:00
Krausus
783536d278 Replaces ID photos with bicons 2016-07-07 01:25:56 -04:00
TheDZD
2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04: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
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
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
Fox-McCloud
119c76ab0e Faster Get Turf from VG 2016-07-05 02:40:05 -04:00
Isaac Erwin
1b8c43b840 The mop now stores 40 units of water instead of having unlimited water, water must be recharged at a cyborg recharger or in a mop bucket 2016-07-04 19:19:16 -04:00