Commit Graph

6693 Commits

Author SHA1 Message Date
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
TheDZD
6998d795c5 Merge pull request #4883 from Fox-McCloud/pets
Allows You To Pet pAIs
2016-07-07 16:49:25 -04:00
TheDZD
2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04: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
TheDZD
1a898dfd37 Merge pull request #4852 from FalseIncarnate/bug_fix
Minor Bug / Exploit Fixes
2016-07-05 20:41:47 -04:00
FalseIncarnate
d57c7c9ae4 Mind-preservation
transfers minds, rather than just keys, to ensure notes and such carry
over to new chickens.
2016-07-05 20:36:02 -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
Krausus
43ba8d56b7 Fixes simple animals sounding twice on hit
Playing the hitsound is handled in the object-based attack code, making
the simple animal-based hitsound redundant
2016-07-05 07:05:09 -04:00
Fox-McCloud
c53eb8607d Allows You To Pet pAIs 2016-07-05 04:15:51 -04:00
Fox McCloud
1fff3832b2 Merge pull request #4869 from Krausus/BorerFixes
Borer Fixes
2016-07-04 12:06:35 -04:00
KasparoVy
c8dca38b6b Vox Suit Revisions and adds Species Refit+Icon Override handling for Suit Collars 2016-07-04 06:12:10 -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
Krausus
32c5220f4c Borer fixes
- Fixes borers dying to environmental damage while inside a host.
- Fixes borers not releasing control of a host when it dies.
- Fixes borers being able to assume control of dead hosts.
- Fixes borers being able to talk to their host while dead.
- Fixes borers being told they can't leave their host while
incapacitated/dead, but then trying to leave it anyway.
- Removes an unused proc.
2016-07-04 02:45:49 -04:00
Fox-McCloud
b57391aba6 Minor Flag Refactor 2016-07-03 23:43:12 -04:00
KasparoVy
8f660f230c killconflicts 2016-07-03 20:23:00 -04:00
KasparoVy
d476516f88 Vox-compatibility for Most Suits, Fixes Reactive Armour Icon Update Bug
Also adds hiding tails by-species. Updates captain space-suit helmet hair-hiding code.
Fixes a bug where Reactive Armour's sprite wouldn't update when you turned it on or off.
Adds species-fitting for clothing accessories.
Adds the ability to open and close the Clown Officer and Soldier coats.

Adds Vox sprites for the following suits and accessories:
Unathi robe, unathi mantle, all ERT armour (not the spacesuits), armour vest, reflective armour vest,
Security armour vest, bulletproof armour vest, Detective armour vest, blueshield armour vest, combat armour vest,
laser tag vests, ian shirt, suspenders, waistcoat, vest, first responder jacket, bomber jacket, security bomber jacket,
black suit jacket, blue suit jacket, purple suit jacket, IAA jacket, NT Rep jacket, forensics jackets, overalls,
captain's carapace, Blueshield coat, trenchcoats, pirate and old pirate coats, HoS coat, HoS trenchcoat, Warden's jackets,
leather jacket, all military jackets, all ponchos, hazard vest, brigphys vest, reactive armour, riot/swat armour,
heavy armour, thunderdome armour, all knight armour, all bombsuits, regular and atmos firesuits, all biosuits, webbing,
clown officer coat, clown soldier coat.
2016-07-03 19:39:15 -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
TheDZD
551b2aefbd Remove some shit from Life(), and fix wiznerd thing 2016-07-03 15:51:43 -04:00
TheDZD
1573e9be7b There we go 2016-07-03 15:51:20 -04:00
TheDZD
4bfd6ce95a Changes numbers 2016-07-03 15:51:19 -04:00
TheDZD
3605aa5e4d Re-Adds Instability 2016-07-03 15:51:17 -04:00
Krausus
76468bc5a4 Fixes some examine inconsistencies 2016-07-03 03:04:36 -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
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
f1bb017d59 Merge pull request #4844 from Krausus/JustWaitASecond
Adds Short Delay to Late-Join Job Selection
2016-07-02 19:15:28 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
TheDZD
506f6885a8 Merge pull request #4834 from Fox-McCloud/emote-revert
Reverts Emote System
2016-07-01 20:36:40 -04:00
Fox-McCloud
1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
Krausus
3f4e15e35a Adds 1-second delay to late-join job selection 2016-07-01 17:22:26 -04:00
Krausus
03fa9c1818 Adds KEEP_TOGETHER to ghost images (#4839) 2016-07-01 12:59:07 -04:00
monster860
64b54498ff Fix #4793 (#4794)
* Fix #4793

* makes it actually work

* Fixes stuff, now it should look identical to the original

* Theere, now it's PERFECT.
2016-07-01 12:03:19 -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
Krausus
6a8ea1db53 Categorizes Late-Join Job List (#4826)
* Late-Join Job List Categorization

* Late-Join Job List Columnization
2016-06-30 20:19:28 -04:00
Fox-McCloud
a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
TheDZD
3a262b7a67 Merge pull request #4777 from Kyep/mindshield
Renames Loyalty implants to Mindshield implants
2016-06-30 12:03:03 -04:00
TheDZD
784b299fe2 Merge pull request #4822 from Fox-McCloud/laughter-demon
Ports TG's Laughter Demon
2016-06-30 11:25:58 -04:00
TheDZD
cdcd4a64de Merge pull request #4824 from Fox-McCloud/lobby-fix
Lobby Players Ready Fix
2016-06-29 22:15:42 -04:00
Fox-McCloud
cf63c2f47e Lobby Players Ready Fix 2016-06-29 13:21:44 -04:00
tigercat2000
282e8088b2 Runtime & Goonchat fixes (#4820)
* Fix goonchat banned-cookie misdetection

* Runtime fixes

* Fix #4813

* Fix #4818

* Whoops.

* Actual emote runtime fix
2016-06-29 11:12:16 -04:00
Fox-McCloud
d61583dd1f better handling 2016-06-29 11:08:51 -04:00
Tastyfish
cc1f984136 Fixes a bunch of to_chat runtimes (#4817)
* Fixes a bunch of to_chat runtimes

* also that one
2016-06-29 08:31:27 -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
TheDZD
7ca80b2581 Merge pull request #4791 from VampyrBytes/Poly_fixes
Poly grabs the colour macro!
2016-06-26 16:43:15 -04:00