Commit Graph

586 Commits

Author SHA1 Message Date
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0
97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
Ergovisavi
9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
2015-08-25 03:24:34 -07:00
Swag McYolosteinen
6b091e0cb6 Merge pull request #11086 from freerealestate/rcdrebalance
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
Remie Richards
eedea4d281 Merge pull request #11018 from Core0verload/hammerspace
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
phil235
70a8046081 Merge pull request #10815 from bgobandit/bagtags
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
Jim Boonie
a7b09a84ab - Made costs and delays variables
- Made plasteel multiplier a variable
- Made shocked grilles shock unprotected RCD users
- Made grilles deconstruct instantly to match wirecutters
- Made RCD unable to deconstruct reinforced floors
- Changed canRwall to canRturf to cover both r walls and floors
- Changed large matter cartridge matter amount to 160 so it can still fit in the RCD
- Added fourth matter cartridge to RCD crate so it once again holds enough cartridges to fully load it
2015-08-08 21:18:45 +12:00
c0
bd8d70ec26 New traitor item: storage implant 2015-08-04 18:28:38 +03:00
c0
600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
Jordie
f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
bgobandit
ab9668dd3d Moves update_icon(). Adds crayons. 2015-07-24 09:38:13 -04:00
bgobandit
3ab197f80f Body bag sprites now update their tag overlay properly. 2015-07-23 20:20:55 -04:00
bgobandit
df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
Ergovisavi
e6a8511ac1 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:50:02 -07:00
Ergovisavi
5f6cf57e07 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:32:08 -07:00
phil235
94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
phil235
9eced1ac5b Fixes thrown closet opening to not use spawn().
Fixes throw_at() to look nicely for xeno leap by adding the diagonals_first argument.
Removes useless gateway/Crossed and gateway/Bumped().
Changes throw_at() to use diagonal directions.
I replaced the atom variable "throwpass" with the LETPASSTHROW pass_flags
I readded hit_check proc to catch things getting on the thrown thing's tile during its sleep(1) (especially needed for mobs running towards the thing), the only other possibility would've been to add throwing checks in atom/movable/Crossed() (called after every move) and I don't think it'd be worth it.
I added the item var "thrownby" to be able to continue to log the thrower of the item when it hits a mob. It removes the need for a thrower argument in throw_impact() and hitby().
2015-07-19 21:29:35 +02:00
Ergovisavi
bf83ef4c53 Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag
Nerfs the rag, allows it to be made with the biogenerator, adds a few to the chef/bartender's closets, and to the maint loot spawner
Adds the ability to empty out a fire extinguisher... for sabotage
2015-07-19 04:12:30 -07:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
duncathan
5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
Iamgoofball
fe7defded4 Security Lockers now start with Security Helmets.
They have everything else, but no security helmets.

This made no sense.
2015-07-07 16:18:01 -07:00
Ikarrus
4f4b8f1774 Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2015-06-28 19:00:16 -06:00
Ikarrus
d07e315ddf Squashed 2015-06-28 12:11:05 -06:00
Ikarrus
8c62ccfe2e Moves clothes from out of equipment lockers and into wardrobe closets
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
Ikarrus
7894263033 Destructible Clothing Tweaks
- Fixes runtime with burning decals without reagents
- Adjusts some burnable flags
- Removes minimum shred prob()
2015-06-27 13:33:33 -06:00
Iamgoofball
856edee625 WHOOPS 2015-06-23 12:57:28 -07:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Ikarrus
3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
Swag McYolosteinen
7929b7dcd7 Merge pull request #10031 from Ikarrus/gangfashion
Gang Update: Fashion War Edition
2015-06-20 18:06:19 +02:00
Jordie0608
538d4ad303 Merge branch 'master' of https://github.com/tgstation/-tg-station into glassisapaintosprite
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
2015-06-20 18:37:39 +10:00
Xhuis
2823a98244 Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-19 11:23:45 -04:00
Swag McYolosteinen
1dde070d18 Merge pull request #9800 from Dorsisdwarf/wittybranchname
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
Ikarrus
e27cdc7efe Resolved Conflicts:
code/game/gamemodes/gang/dominator.dm
2015-06-18 23:05:51 -06:00
Xhuis
e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
Ikarrus
46a5e578e4 Gang Update: Fashion War Edition
This update primarily deals with gang outfits and expands on how they affect the round.
2015-06-18 20:01:57 -06:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
Xhuis
3bc466a0ff Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-16 11:42:47 -04:00
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
Iamgoofball
a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Iamgoofball
4de75c539f Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
kingofkosmos
899f2f5119 Security locker unlocks if you attack it with an empty hand. 2015-06-13 11:20:33 +03:00
Razharas
b7150068cc Merge pull request #9783 from nukeop/master
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
xxalpha
9ba7e6aaf4 Fixes three runtimes.
Better fix. src. purge
2015-06-11 21:30:13 +01:00
Dorsisdwarf
7afd81e083 removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type 2015-06-11 08:09:36 +01:00
Xhuis
50e49d1136 FEATURES SIX AND SEVEN: Suicide msg's and cloaks 2015-06-10 14:17:38 -04:00