Commit Graph
7135 Commits
Author SHA1 Message Date
SamCroswell cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
TheDZDandGitHub dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks
Cyborg Upgrade Additions and Refactor
2016-07-12 21:22:57 -04:00
TheDZDandGitHub 5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate
Bureaucracy Update
2016-07-11 21:20:06 -04:00
TheDZDandGitHub 66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane
Nanotrasen Rep Cane Tweak
2016-07-11 20:59:34 -04:00
TheDZDandGitHub ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor
Blood Refactor+Fixes
2016-07-11 20:57:25 -04:00
Fox McCloudandGitHub 374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf
Fixes pulse shot cost.
2016-07-11 20:46:22 -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 McCloudandGitHub 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
TheDZDandGitHub 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
monster860 10292105ad Makes a bunch of UI's use /datum/browser 2016-07-10 09:19:14 -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 McCloudandGitHub 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
Fox-McCloud 405df28fab Borg Power Use Refactor 2016-07-09 01:50:26 -04:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Kyep dd8897fd22 Fixes merge conflict 2016-07-07 21:57:42 -07: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 McCloudandGitHub 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 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
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
Fox McCloudandGitHub 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
TullyBurnalot 83d40f19ea Armless Cuffing Makes Sense Now
This was entirely DZD's work. It has my name on it because it was a
"learn-as-you-code" experience.

Regardless:

- Can now cuff people with two hands, or one hand;
- Can no longer cuff people with no hands
2016-07-06 02:20:40 +01:00
TheDZDandGitHub 1a898dfd37 Merge pull request #4852 from FalseIncarnate/bug_fix
Minor Bug / Exploit Fixes
2016-07-05 20:41:47 -04:00
Fox McCloudandGitHub df0c9e51cf Merge pull request #4870 from Kyep/specops_fix
Fixes NTSpecOps Radios
2016-07-05 20:00:21 -04:00
TheDZDandGitHub 412d4cf501 Merge pull request #4866 from Fox-McCloud/flag-change
Minor Flag Refactor
2016-07-05 19:47:16 -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
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
TheDZDandGitHub 9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance
TG Armor Rebalance
2016-07-02 19:26:41 -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 1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
FalseIncarnate 496c3a7843 Paradise Pop
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!

Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes

The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.

Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!

Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)

Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
2016-07-01 13:31:09 -04:00
TheDZDandGitHub 3a262b7a67 Merge pull request #4777 from Kyep/mindshield
Renames Loyalty implants to Mindshield implants
2016-06-30 12:03:03 -04:00
Ronald T. Mullins IIIandFox McCloud 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
KraususandFox McCloud 8d7e638f6e Improved to_chat debug message (#4795)
Also fixed a couple related, minor bugs
2016-06-28 11:34:54 -04:00
Kyep 3183192c27 Tigercat, Tigercat, does whatever a Tigercat does 2016-06-27 22:05:37 -07:00