Commit Graph

22686 Commits

Author SHA1 Message Date
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE
-tg- HUD styles
2016-04-25 19:57:59 -04:00
Tigercat2000
d01eb6504e Fixes 2016-04-25 16:53:40 -07:00
TheDZD
98a94a37d5 Merge pull request #4273 from FlattestGuitar/examine
Makes a human's species visible on examine.
2016-04-25 18:37:17 -04:00
TheDZD
f65910c3d9 Merge pull request #4274 from tigercat2000/attackpref
#4243 preference option
2016-04-25 18:34:48 -04:00
TheDZD
cdc20258a1 Merge pull request #4212 from Tastyfish/bans
Cleans up special role jobbans
2016-04-25 18:34:37 -04:00
TheDZD
6e71809d5e Merge pull request #4272 from Fox-McCloud/injections
Fixes Several Injections
2016-04-25 17:17:58 -04:00
pinatacolada
ee40390ffe Plasma security now spawn with their gun in the bag
Fixes #4071

Warden, officers, and pod pilot spawn with the taser in their bag.
Head of Security spawns with egun in the bag.
Brig physician spawns with pen light in their bag.
Also made other species pod pilots spawn with the taser in their bomber
jacket, since it now can hold it, and is more consistent with the rest
of the officers

🆑 pinatacolada
fix: Plasmamen security now spawn with their suit slot items in their
bags
tweak: Pod pilots spawn with taser in the suit slot
/🆑
2016-04-25 17:47:46 +01:00
Mieszko Jędrzejczak
399fe7cdc2 slime people whoopsie 2016-04-25 12:50:45 +02:00
Fox-McCloud
c587019b87 Ports Door Wands 2016-04-25 06:06:20 -04:00
Mieszko Jędrzejczak
0f7be5576f Gunshot sounds, uplink references, less spammy tommygun, fixes 2016-04-25 11:32:48 +02:00
Fox McCloud
ff2da1c159 Merge pull request #4238 from Aurorablade/Kungfu
Fethas Carnival of Horrors:crouching tarajan,hidden unathi
2016-04-25 04:35:35 -04:00
Fox McCloud
6fbe7d995e Merge pull request #4275 from FalseIncarnate/kitchen
Removes egg reagent from some foods, fixes reagent removal for foods
2016-04-25 04:33:43 -04:00
Fox-McCloud
d546d4efd8 Science Rebalance Round II 2016-04-25 04:07:49 -04:00
Tastyfish
f51057b997 Fixes beach drop turf smoothing 2016-04-24 22:53:48 -04:00
HugoLuman
f16dc32686 Fixes IPC deathgasp spam
Adds a brain damage threshold to the can_revive_by_healing proc to prevent braindead IPCs from continually dying and reviving.

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-24 16:00:28 -07:00
pinatacolada
ccf51de2ca fixes #4259 2016-04-24 22:17:28 +01:00
pinatacolada
af04360af1 SKREEEE 2016-04-24 20:10:31 +01:00
Mieszko Jędrzejczak
03c173aeaf Lowers costs, adds darts to autolathe 2016-04-24 09:19:03 +02:00
Aurorablade
47f22e9152 lol2chat 2016-04-24 00:22:37 -04:00
Tigercat2000
57648bd6b7 Fix multiple instances of to_chat not being used 2016-04-23 20:45:37 -07:00
Fox McCloud
e7bb8c22cc Merge pull request #4220 from CrAzYPiLoT-SS13/chess_ma_dudes
Adds SpessChess!
2016-04-23 21:05:53 -04:00
Tigercat2000
d08cb0db9c Adds a preference setting to the "ghost item attack" thing 2016-04-23 17:31:52 -07:00
TheDZD
5be973de20 Merge pull request #4243 from Fox-McCloud/attack-animations
Ports TG's Improved Attack Animations
2016-04-23 20:30:38 -04:00
FalseIncarnate
68bcfc5d0c Removes egg reagent from some foods
Simply put, this removes the egg reagent from the following
chef-produced food items:
- Bread
- Apple Tart
- Sugar Cookie
- Fish Fingers
- Nougat

Balance-wise, this really does very little (except make it so bread
doesn't make you fart), and should generally impact just about nothing
short of feeding people grilled cheese sandwiches to cause them to fart
on a bible.

At the same time, this introduces a couple spawn(1) into the New() code
for food items that are meant to clear certain reagents when made (like
removing sugar from some candies or egg from bread), to make it so they
actually remove the reagent.
- Since this was getting called before the reagents of the ingredients
are passed into the food through the cooking process, you'd end up with
sugar in your rainbow cotton candy when it wasn't meant to be there.
2016-04-23 16:29:44 -04:00
Mieszko Jędrzejczak
038ca241c6 Fixes the fixes 2016-04-23 20:26:54 +02:00
TheDZD
e09f708f2c Merge pull request #4254 from Meisaka/enoughwiththesss
Make silicon/AI/robot/drone/pAI emotes sane again.
2016-04-23 10:20:39 -04:00
Mieszko Jędrzejczak
3151b7f3bd A human's species will now be visible on examine. 2016-04-23 12:21:14 +02:00
Fox-McCloud
e9010971bf Fixes Several Injections 2016-04-23 03:45:29 -04:00
Aurorablade
2f3754af77 folder rename in progreess... 2016-04-22 23:58:03 -04:00
TheDZD
f69ff5f30a Merge pull request #4264 from Fox-McCloud/mining-crate
Updates Mining Loot Crates
2016-04-22 23:57:32 -04:00
TheDZD
7990a25cf0 Merge pull request #4255 from Fox-McCloud/how-revolutionary
Updates Revolution
2016-04-22 23:57:03 -04:00
Aurorablade
1a8ae7f826 removing the only change i can think of before travis started failing. 2016-04-22 23:53:06 -04:00
Aurorablade
ac31143cb9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 23:29:06 -04:00
Fox McCloud
e6666a8c4c Merge pull request #4266 from monster860/fixgriff
Fix ERT teleport exploit with abductor
2016-04-22 23:10:32 -04:00
Aurorablade
01e571bc91 don't start with me travis... 2016-04-22 22:43:41 -04:00
Fox-McCloud
6da5d4f1fc re-add things 2016-04-22 22:36:03 -04:00
Aurorablade
cb38f7b0f9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 21:45:18 -04:00
Aurorablade
cce2e7e297 THE CREW IS NOW 50 BUTTBOTS 2016-04-22 21:42:59 -04:00
Mieszko Jędrzejczak
c96712cbf7 Adds the ability to pick up all ammo from a turf using a magazine 2016-04-22 23:35:56 +02:00
Mieszko Jędrzejczak
5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02:00
Fox McCloud
80ee29c440 Merge pull request #4271 from Tastyfish/in-soviet-russia-gun-reloads-you
Fixes reloading gun for player-controlled hostiles
2016-04-22 16:17:05 -04:00
Aurorablade
ec263dbfca mimejutsu 2016-04-22 16:07:56 -04:00
Tastyfish
848b486020 Fixes reloading gun for player-controlled hostiles 2016-04-22 15:59:20 -04:00
Tigercat2000
66416ae5ec Merge remote-tracking branch 'upstream/master' into CRAZY_HUDS_AMIRITE
Conflicts:
	code/game/gamemodes/vampire/hud.dm
2016-04-21 20:31:58 -07:00
Tigercat2000
0f70e6810b -tg- OOP Hud Refactor
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
2016-04-21 20:28:08 -07:00
KasparoVy
18520dc1e0 Fixes Headlight Sprite and Fixes Hair+Head Accessory Animation
Hair and Head Accessories will now no longer animate as fast as they
possibly can and, instead, will follow the timings the spriter defined
in the .dmi file.
2016-04-21 23:00:11 -04:00
Fox McCloud
ff27b4f77a Merge pull request #4263 from Tastyfish/smooth-shuttles
Fixes shuttle smoothing
2016-04-21 22:58:49 -04:00
KasparoVy
6b73c047c5 Fixes Runtime
Occurred when trying to list hair, marking or facial hair styles in
situations where the head is the default Morpheus head (no replacement
head).
2016-04-21 22:23:09 -04:00
monster860
55af378cfe Fix griff 2016-04-21 22:22:02 -04:00
Fox-McCloud
1c99344d16 derp 2016-04-21 21:51:53 -04:00