672305e034
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
2015-02-22 22:12:11 +01:00
886bf7400b
Final crafting fixes
2015-02-22 02:24:53 +01:00
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
554765f49a
Merge pull request #342 from Fox-McCloud/MiningSounds
...
Mai Immershun
2015-02-20 07:42:34 -05:00
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
beae1bbe0f
Mai Immershun
...
The hills are filled with the sounds of mining
2015-02-18 23:14:28 -05:00
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
fbd9c367c0
NODROP flag addition & handling
...
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
97f80d0f5b
Merge pull request #323 from Fox-McCloud/Sounds
...
Sounds
2015-02-17 18:44:54 -05:00
a03879d83f
Sound Updates
2015-02-16 16:29:43 -05:00
8726bad5b0
Z-level check refactor
2015-02-16 20:33:28 +01:00
0b937d5ace
Emag refactor
2015-02-13 16:59:20 +01:00
b3a0c9a975
Removes TABLEPASS and FPRINT flags
...
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
7285f39fc1
Defib update, cell path update
2015-02-09 16:12:01 +01:00
8fae0f029f
Accessory overhaul
2015-02-08 14:29:10 +01:00
2b85b9b777
TG Mining Items
2015-01-30 00:23:53 -05:00
28d55b9b42
Labor ore chance changes
2015-01-16 22:34:19 +01:00
e59a94a8a1
Constructable newscaster, labor camp overhaul, other fixes
2015-01-16 21:50:33 +01:00
be1d527069
Borg Modules
2015-01-10 21:41:41 -05:00
525bb1a96f
Stun Changes
2014-12-30 12:30:14 -05:00
84b9f05149
Xeno Tweaking
2014-12-16 20:26:27 -05:00
a1959291b7
Coin Flipping! Also more map fixes.
2014-12-04 17:12:41 -05:00
72196cd272
Merge pull request #119 from ZomgPonies/master
...
sync
2014-11-24 02:45:57 +01:00
211023bd67
Syndicate Medibots, Energy Recharge Fix
...
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.
- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
2014-11-08 19:16:33 -05:00
01cc6409e7
supermatter drill
...
New traitor item
2014-11-06 19:28:34 +01:00
e5e9013ab4
make bananium smeltable
...
exactly as the title says, though, the smelter menu calls it 'clown',
because the oretag is clown, didn't fix it, because i dont know what
things use the oretag variable(i know some), and didn't want to break
anything over such a small bug
2014-09-24 15:15:56 +02:00
24b78b69be
Use absolute paths next time
2014-08-16 18:11:49 -04:00
4330a339cd
beep book goonfabs 4 i fucking hate git etc etc.
2014-08-14 12:27:15 -07:00
ce7d05ccf3
Fix errors from ticker initializing after map ore
...
Ores only count towards the station's score if it spawns on Z=5 (Mining
Asteroid Level). The old method caused errors in the server log because
gameticker/ticker initialized after the map ore spawns.
This also means that ore mined on the Clown Planet don't count.
2014-08-04 16:24:00 -04:00
109754ac2b
Track Ore Mined for Scoreboard
...
Increments the score for ore mined each time ore is mined (i.e.:
spawned) after the game starts.
2014-08-04 12:00:44 -04:00
c0ba021bcd
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
...
Conflicts:
code/datums/supplypacks.dm
code/game/machinery/hydroponics.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/spray.dm
maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
ed1e3f8bc4
Fixed plasma ore
2014-07-25 11:36:08 -04:00
ebb9f724aa
Hydroponics rewrite, details will be in PR. Big commit.
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/game/gamemodes/events/spacevines.dm
code/game/machinery/seed_extractor.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/mob.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
icons/obj/hydroponics.dmi
maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
64554340f4
Modifed faction system to use a list instead. Mobs can belong to multiple factions at once.
2014-07-19 13:26:55 -04:00
6b08fa875a
Fixes #5608
...
Conflicts:
code/modules/mining/machine_processing.dm
2014-07-14 03:25:02 -04:00
1079661a1e
Reapplied scanners to map, stopped braces working on drill turfs with no resources.
...
Conflicts:
maps/tgstation2.dmm
2014-07-13 08:45:03 -04:00
333c3c8ae7
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
...
Conflicts:
baystation12.dme
code/modules/admin/admin_verbs.dm
maps/tgstation2.dmm
2014-07-13 08:44:47 -04:00
6e9f55f262
Fixes #5472
2014-07-13 06:34:37 -04:00
7fe1c6cb0e
Update distribution.dm
2014-06-25 06:16:02 -04:00
7f96a7d6bc
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 06:15:49 -04:00
5439b04241
reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
Conflicts:
code/global.dm
code/modules/mining/mine_turfs.dm
code/modules/research/xenoarchaeology/misc.dm
2014-06-20 08:13:42 -04:00
8b77070cbe
Added new minerals and sprites to mining
2014-06-19 15:24:03 -04:00
bb54ac1ac4
Fix artifact spreading and large scanner. Remove extra list used the master_controller var again.
...
Conflicts:
code/modules/mining/mine_turfs.dm
code/modules/research/xenoarchaeology/misc.dm
code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
2014-06-19 10:33:50 -04:00
4f20de625c
Fixes #5255 and walking over edges
...
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
2014-06-19 10:14:35 -04:00
6ada0cf263
Adds sharp and edge flags to appropriate items
...
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
Conflicts:
code/modules/research/xenoarchaeology/finds/finds_misc.dm
2014-06-17 07:08:25 -04:00
a80c317cbe
More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
...
Conflicts:
code/game/objects/items/stacks/sheets/mineral.dm
code/game/supplyshuttle.dm
2014-06-15 07:58:00 -04:00
Markolie