Commit Graph

13925 Commits

Author SHA1 Message Date
Kyep
c8cede8916 Tiger 2016-07-07 21:53:44 -07:00
FalseIncarnate
2b77c45694 Merge conflict fix 2016-07-08 00:46:46 -04:00
Fox-McCloud
9c3843092d fixes 2016-07-08 00:34:56 -04:00
Chakirski
2c259c4e22 Update component.dm 2016-07-07 23:13:24 -05:00
Chakirski
e789935c30 Update component.dm 2016-07-07 22:42:24 -05:00
TullyBurnalot
9821a7f757 Prescription Monocles
- Makes monocle prescription upgradable
- Adds monocles to Loadout options
2016-07-08 03:59:25 +01:00
Fox-McCloud
2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Chakirski
5e8c2599d1 What does the fox say? 2016-07-07 21:44:15 -05:00
Fox-McCloud
17be7813b8 shielded hardsuits 2016-07-07 22:39:40 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TullyBurnalot
edc7b921ff Fixes boxes in evidence bags in boxes
- Boxes no longer allowed inside evidence bags
2016-07-08 03:28:58 +01: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
8953ea6fbf Removes needless src
- Woops
2016-07-08 02:57:17 +01:00
TheDZD
52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
TullyBurnalot
018c771cf6 Adds ping noise
- Photocopiers actually ping when copying butts
2016-07-08 02:30:57 +01:00
TullyBurnalot
65edca1010 Adds spaces
- Adds spaces in to_chat(H)
2016-07-08 02:19:25 +01:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
TullyBurnalot
dba4ed1f3a Fixes Tiger's suggestions
- 2 instances of "ass" changed to "H"
2016-07-08 01:31:06 +01:00
TullyBurnalot
94510342a5 Fixed last line of templates
Adding "Do Not Reply" could have been confusing to people receiving
faxes, so it was stricken.

Courtesy of Kyep/Kyet/Tzo(?) for pointing this out.
2016-07-08 01:24:47 +01:00
TullyBurnalot
ba8844af85 Fix to DZD's suggestions
- Sleep(20) changed to Spawn(20)
- Needless code removed
- Damage upgraded to 30 Burn
2016-07-08 00:55:35 +01:00
TullyBurnalot
7972dbff32 Adds Posterior Burning
- Photocopiers can now be emagged;
- Photocopiers deal 20 Burn damage to any mob attempting to fax their
posterior
2016-07-08 00:37:37 +01: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
Chakirski
cee0f4185f I can see! 2016-07-07 15:58:05 -05: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
26ee665040 Merge pull request #4905 from Fox-McCloud/sechud-fix
Fixes Sechud Flash Protection
2016-07-07 16:47:45 -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
Chakirski
f61225f3b3 EMP-Binary 2016-07-07 15:05:33 -05:00
TullyBurnalot
4086396f0e Added an exclamation mark
Pedantry
2016-07-07 20:38:23 +01: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
Mieszko Jędrzejczak
932bbc7016 vox coat sprites, things 2016-07-07 17:42:20 +02:00
Crazylemon64
f0bac4c179 Initialization deferral is now handled by the caller, but
is now also seamless
2016-07-07 00:17:21 -07:00
Kyep
5454011593 Fixes trialmin bug, adds ERT response reminder 2016-07-06 23:47:08 -07:00
Kyep
de77c072fb Makes capital crime options consistent 2016-07-06 23:13:56 -07:00
Crazylemon64
1745c71474 Fixes a bug involving a map template resetting the map loader's
progress
2016-07-06 22:51:48 -07:00
Krausus
783536d278 Replaces ID photos with bicons 2016-07-07 01:25:56 -04:00
TullyBurnalot
4a84ced8fd Removed Stamps. Removed memes.
- No more denying over lack of stamps. Just lack of signatures;

- No one ever referenced Memetic Kill Agents. No one.
2016-07-07 04:34:44 +01:00
TullyBurnalot
87b0e49100 Admin Fax Template Flair
- Added custom messages to EvilFaxes, for extra schadenfreude
- Fax body for Templates changed to more unique versions

🆑
tweak: Added custom messages for evil faxes
tweat: Added unique text body for each non-evil fax template
/🆑
2016-07-07 04:17:25 +01:00
TheDZD
2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04:00
Fox-McCloud
c6ecdbbd11 Fixes Sechud Flash Protection 2016-07-06 17:45:58 -04:00
Mieszko Jędrzejczak
430086d053 rejoice for it compiled 2016-07-06 23:37:28 +02:00
Mieszko Jędrzejczak
dfaaa879f0 what are you talking about 2016-07-06 23:15:26 +02:00
Mieszko Jędrzejczak
8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
Kyep
45d4f7b768 Second DZD change 2016-07-05 21:41:40 -07:00
Kyep
9c42220dec DZD Fixes 2016-07-05 21:39:03 -07: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
FalseIncarnate
696c26c65e Appeases coding standards, adds ingredient icons to UI
The bottler interface now will show both the icon and name of the
ingredient in each slot.

Also cleaned up stuff as commented on by DZD
2016-07-05 21:22:02 -04:00
TheDZD
1a898dfd37 Merge pull request #4852 from FalseIncarnate/bug_fix
Minor Bug / Exploit Fixes
2016-07-05 20:41:47 -04:00