cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 14:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,864 Commits 28 Branches 2 Tags
a97f0eaeea2446bcb9f7a6dbd7ae7aa47e418647
Commit Graph

5631 Commits

Author SHA1 Message Date
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
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
Krausus
d6dd9075f3 Fixes agent ID HTML not updating 2016-07-07 10:21:58 -04: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
Kyep
1d24dc1b63 Fixes NTSpecOps Radios 
- Changes NT Navy Officer / Special Ops Officer headsets to broadcast to
ERT radio by default, BUT also have the ability to talk to special ops
(deathsquad) radio by using .- (or #-, or #-).
- This fixes a bug where Special Ops Officers can't actually talk to
special ops teams because special ops teams are on a different frequency
to ERTs, and neither of the two channels (ERT or SpecOps) can be
selected with a :X/.X/#X style letter.
 2016-07-04 02:52:49 -07:00
Fox-McCloud
b57391aba6 Minor Flag Refactor 2016-07-03 23:43:12 -04:00
Isaac Erwin
6fd7f5741f Changes the janiborg's mop into an advanced mop with limitless water 
Now the mop is potentially actually useful. How does it get water?
Bluespace, of course.
 2016-07-03 16:16:26 -04:00
FreeStylaLT
9bb6a2f7dc Tweaked probabilities, added black gloves, real insu gloves, mini hoe and botany tray to maint drops 2016-07-03 20:29:44 +03:00
FalseIncarnate
daf777979f Minor Bug / Exploit Fixes 
Fixes #4786
- Chicks that age up to chicken will retain their ghost (if any) into
their adult stage.

Fixes #4836
- Intercoms now properly check their buildstage when removing cables and
electronics to avoid being used to infinitely generate these objects
- Fire alarms and air alarms now also have this exploit-protection. APCs
already had a form of this protection.
 2016-07-02 23:32:18 -04:00
TheDZD
9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance 
TG Armor Rebalance
 2016-07-02 19:26:41 -04:00
TheDZD
62a1fc5a70 Merge pull request #4417 from tigercat2000/bay_equipping 
Bay/Polaris loadouts
 2016-07-02 19:26:21 -04:00
Fox-McCloud
85384036e9 tweak 2016-07-02 14:10:16 -04:00
Fox-McCloud
d98af32ce1 Fixes a Few Non-Respected Shields 2016-07-02 02:42:25 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
Fox-McCloud
1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
Tigercat2000
567e1576f5 Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/modules/client/preference/preferences_toggles.dm
 2016-06-30 17:40:10 -07:00
TheDZD
3a262b7a67 Merge pull request #4777 from Kyep/mindshield 
Renames Loyalty implants to Mindshield implants
 2016-06-30 12:03:03 -04:00
Fox-McCloud
2df7ff16d8 Fixes Sound/Debug Preferences 2016-06-30 10:57:58 -04:00
Ronald T. Mullins III
7e9ff08ceb bandolier_fix2 (#4807) 
* bandolier_fix2

I'm dumb. Bandolier should update_icon with New()

* Update belt.dm
 2016-06-28 23:44:30 -04:00
Krausus
8d7e638f6e Improved to_chat debug message (#4795) 
Also fixed a couple related, minor bugs
 2016-06-28 11:34:54 -04:00
monster860
4bf28bdc33 Wormhole gun fixes and changes (#4792) 
* Wormhole gun fixes and changes

* icon_state

* Revert lack of decay chance
 2016-06-28 11:33:26 -04:00
Kyep
3183192c27 Tigercat, Tigercat, does whatever a Tigercat does 2016-06-27 22:05:37 -07:00
Tigercat2000
82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
 2016-06-27 08:20:49 -07:00