AnturK
56d2a34201
Splits beds and chairs
...
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
Bjorn Neergaard
ddab6823d3
Fix up crates
...
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
duncathan
9066bc7c4f
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/controllers/subsystem/air.dm
code/datums/gas_mixture.dm
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
tgui/assets/tgui.css
tgui/assets/tgui.js
tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
AnturK
23efe5f675
Adds a variable to block shuttles from changing destinations midflight for mining shuttle
2016-01-09 17:44:16 +01:00
duncathan
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
KorPhaeron
79e5f3d37e
Check that actually works
2015-12-30 19:10:49 -06:00
KorPhaeron
e0157185fc
Blacklist
2015-12-30 10:10:54 -06:00
KorPhaeron
9148b9ccd2
Bluespace shelter
2015-12-29 13:08:29 -06:00
duncathan
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
KorPhaeron
6716fc9282
Entirely area based
2015-12-24 03:50:27 -06:00
KorPhaeron
404666546b
More weather updates
2015-12-23 04:45:09 -06:00
KorPhaeron
755455c9de
New sprite
2015-12-10 01:36:27 -06:00
bgobandit
47dcbc2fd0
Various mining additions, fixes and rebalances.
2015-11-18 19:14:28 -05:00
phil235
d3ee910211
Makes effect system code more OOP.
...
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
phil235
9c79257aab
Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
...
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
xxalpha
deb60ae309
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
Fox-McCloud
9b668de7bb
Merge remote-tracking branch 'upstream/master' into Impropermaterials
2015-09-13 08:58:40 -04:00
Fox-McCloud
89fa65c127
Fixes Consistency Issue with Materials
2015-09-12 03:51:33 -04:00
bear1ake
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
Remie Richards
271b7344f5
Merge pull request #11045 from KorPhaeron/survivalpod
...
Survivalpod
2015-08-18 20:50:18 +01:00
KorPhaeron
fece9cf524
I forgot how my own code worked
2015-08-16 10:49:51 -05:00
KorPhaeron
dcee74e952
Fixed the src.loc stuff
2015-08-15 21:41:19 -05:00
KorPhaeron
109cbe7280
Survival Pod
2015-08-05 16:18:14 -05:00
Rui Neves Carvalho
f0ebee0467
Digging gets the same progress bar as minning.
...
Fixes #10854
2015-08-01 08:18:33 +01:00
Razharas
6fad4d1df8
Merge pull request #10271 from Cheridan/red_faction
...
Removes Access Restriction on Mining Shuttle Console
2015-07-05 00:21:58 +03:00
xxalpha
cfb5e724b6
Material container, all items can have materials, wake me up
...
cant wake up
go to sleep debug
2015-07-01 03:34:47 +01:00
Cheridan
a883997fdc
Removes Access Restriction on Mining Shuttle Console
2015-06-29 15:28:36 -05: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
GunHog
4628bb7a15
Conflict resolution
...
With myself. I have internal demons.
2015-05-09 11:49:11 -05:00
GunHog
7c9667db38
Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me
2015-05-09 11:40:44 -05:00
GunHog
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
GunHog
45f2336413
Fixes the mining borg diamond drill upgrade
...
- Made the borg diamond drill upgrade a child of the standard borg
mining drill.
2015-05-06 10:09:57 -05:00
kingofkosmos
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
Jordie0608
26ca19e07d
Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
...
Conflicts:
code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
phil235
ba772b3291
derp.
2015-04-13 16:34:49 +02:00
Jordie0608
8610d24a75
merges secure closet code into normal closets, fixes overlay bugs
2015-04-13 17:38:57 +10:00
phil235
b842c800a8
Fixes miner cyborg being able to eject their drill's cell.
2015-04-12 16:18:42 +02:00
phil235
13baa6e3cb
Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
...
Conflicts:
code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
Jordie0608
37277f66e7
pre-map compile
2015-04-08 15:40:41 +10:00
phil235
7df5998740
Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.
2015-04-08 03:44:56 +02:00
Jordie0608
d2600d8ea2
whoops
2015-03-31 21:51:48 +11:00
Jordie0608
e70134a37a
made warning function not really dumb
2015-03-31 21:49:07 +11:00
Jordie0608
879659a3d1
cyborg drills use internal battery first + charging fix
2015-03-31 21:24:48 +11:00
ACCount12
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
pudl
69924a15be
plasma/ripley update
2015-03-25 18:06:26 -05:00
Jordie0608
a7e23d672a
Improves drill's handling of power
2015-03-05 17:12:12 +11:00
paprka
066b2762d3
lots of crap
2015-02-14 17:25:45 -08:00
paprka
52bac40485
nerfs mining drill a little
2015-02-13 22:04:38 -08:00
paprka
ab3ff729ce
some fixes
2015-02-13 21:44:04 -08:00
paprka
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
