TheDZD
6d095d50f5
Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued
...
More Reagent Refactoring and Cleanup
2016-07-21 10:12:14 -04:00
Fox-McCloud
00a470fd6d
removes stupid sdisabilities
2016-07-21 02:24:54 -04:00
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
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
Krausus
eecf8ba93b
to_chat fixes
...
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
TheDZD
5e2d7920c7
Merge pull request #4713 from DaveTheHeadcrab/engineer_workboots
...
Engineer Workboots
2016-06-22 14:03:04 -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
TheDZD
4df4b58bc1
Merge pull request #4687 from Fox-McCloud/crouching-warden-hidden-greytide
...
Gives Warden Krav Maga Gloves
2016-06-19 13:13:11 -04:00
SamCroswell
cbcf30335f
Boots for Atmos Techs!
2016-06-18 22:17:16 -04:00
SamCroswell
3e25608535
Engineer Workboots
2016-06-18 22:08:59 -04:00
DaveTheHeadcrab
0c12ef1c0a
Security Armor Update ( #4660 )
...
* Revert "scanner icon"
This reverts commit 86a7b5cf4f
2016-06-17 11:17:56 -04: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
Fox-McCloud
f817351d2a
part1
2016-04-16 10:40:21 -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
Fox-McCloud
b6a6b54ff8
final touchups
2016-03-11 21:13:38 -05: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
