Commit Graph

229 Commits

Author SHA1 Message Date
Fox-McCloud
a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -04:00
Fox-McCloud
e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
Fox McCloud
5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts
Did someone say "loadouts"?
2016-07-15 11:25:34 -04:00
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -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
Mieszko Jędrzejczak
8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
Fox-McCloud
6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
Mieszko Jędrzejczak
30299a0b6b hon hon, mon ami! 2016-07-09 21:56:17 +02:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07: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
Kyep
de77c072fb Makes capital crime options consistent 2016-07-06 23:13:56 -07:00
Mieszko Jędrzejczak
8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
TheDZD
9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance
TG Armor Rebalance
2016-07-02 19:26:41 -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
5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
2016-06-19 16:28:57 -07:00
Fox-McCloud
b89364e1df Gives Warden Krav Maga Gloves 2016-06-15 17:15:58 -04:00
Tigercat2000
599527a480 Add skirts to wardrobe lockers. 2016-06-13 21:13:10 -07:00
TheDZD
f7d4cbe108 Fixes paths, snipers, turrets, mechas, some other things. 2016-05-31 22:50:59 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
Fox McCloud
3b30dae4a0 Merge pull request #4455 from razekpraxis/Paradise_LockClick
Adds a click sound when you lock a locker
2016-05-19 19:15:27 -04:00
Razek
8efc712b71 fixed 2016-05-18 09:07:59 +01:00
Razek
9144289780 Adds a click sound when you lock a locker. (I was so bored.)
Signed-off-by: Razek <megamattman2234@hotmail.co.uk>
2016-05-17 18:02:39 +01:00
Fox-McCloud
c587019b87 Ports Door Wands 2016-04-25 06:06:20 -04:00
Tastyfish
d56bf196a8 in for loops 2016-04-16 01:52:03 -04:00
Tastyfish
178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
VampyrBytes
1148bde3a6 eating refactor (#3733) + bugfixes
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)

Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.

The second was related to the amount you took in when drinking
2016-03-05 08:03:39 +00:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Fox McCloud
166b3951b8 Merge pull request #3676 from Aurorablade/ThePutsaNewShadeOnThings
Fethas Carnival of horrors: A new shade for the detective
2016-02-26 20:02:41 -05:00
Aurorablade
3c7281c2dd changes 2016-02-26 00:52:57 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Aurorablade
bbac4006b5 fixc all the things. 2016-02-23 02:48:13 -05:00
Aurorablade
2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
TheBeoni
156acacb4d Removed sec hailer 2016-02-20 12:43:44 +01:00
TheBeoni
bf7fcec275 Corrected. 2016-02-20 12:33:57 +01:00
TheBeoni
ce0f5a962a Adds new types of sandals. 2016-02-20 02:56:26 +01:00
KasparoVy
aa4e1eb970 Sharing is Caring: Masks Galore
Adds Vox versions of the Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer.

Adds versions of the following, re-sprited to fit Unathi, Tajara and Vulpkanin:

    Balaclava, up and down state
    All bandana colours (+ skull pattern), up and down states
    Breath mask, up and down state
    Clown mask+wig
    Cyborg mask
    Death Commando mask
    Gas mask
    All wrestling masks
    Medical mask, up and down state
    Mime mask
    Owl mask
    Plague doctor mask
    Ninja mask
    Sechailer, up and down state
    Sexy Clown mask+wig
    Sexy Mime mask+wig
    Sterile/Surgical mask, up and down state
    SWAT mask
    Welding gas mask, visor up and down state
    Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer
    All smokeables re-positioned so non-humans aren't smoking through their cheek.

Also fixes some typos, does a tiny bit of cleaning and gives the Warden their sechailer.
The sprite was just laying around, it seems.
2016-02-01 17:49:37 -05:00
KasparoVy
cf005e9987 Readds black beret to locker, gives it armour. 2016-01-25 02:08:38 -05:00
KasparoVy
5e4a2b5dea Blueshield Beret Tweak
Adds a navy blue version of the Centcom Officer's beret, giving it to
the Blueshield.

Gives the Blueshield beret the exact same armour and strip-delay values
as the SECURITY OFFICER'S beret.
2016-01-24 22:48:10 -05:00
Fox-McCloud
7d30c5aa8f chaplain closet 2016-01-23 07:57:30 -05:00
SamCroswell
134e507ee6 Asset Protection Energy Gun 2016-01-08 00:27:51 -05:00
Aurorablade
c3f662a6dc zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz 2015-12-15 03:08:16 -05:00
Aurorablade
76eaf85c11 sec sunglasses fix 2015-12-13 23:43:01 -05:00
Aurorablade
95d8b50345 hud_updateflag purge!
EXTERMINATUS BITCH
2015-12-13 17:16:14 -05:00
TheDZD
55e0ac4507 Merge pull request #2770 from Fox-McCloud/bacpacks-and-stuff
Backpack Fixes and Port
2015-12-08 22:00:50 -05:00
Fox-McCloud
00800803ff Backpack Fixes and Port 2015-12-07 19:11:24 -05:00