Commit Graph

1148 Commits

Author SHA1 Message Date
Lzimann
5cbd818d1a Addresses the review 2017-08-09 11:10:48 -03:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
Joan Lung
5475339028 Fixes the Hierophant not spawning its crusher trophy 2017-08-07 22:33:46 -04:00
Jordan Brown
3ec4aec215 Merge pull request #29601 2017-08-01 09:37:28 -04:00
shizcalev
99624b8e74 further spellchecking 2017-07-31 23:09:08 -04:00
Ashe Higgs
0a32812982 Separates actions.dmi into multiple files (#29587)
actions.dmi is way too cluttered and messy, and with inhands getting the axe I decided to fix this, too. I separated the major categories of actions into their own files, like antagonist-specific actions and spells. A full list of categories is found here:

    actions_AI.dmi contains AI-specific actions;
    actions_clockcult.dmi contains clockcult-specific actions, and scripture quickbind icons;
    actions_cult.dmi contains cult-specific actions as well as sintouch;
    actions_flightsuit.dmi contains flightsuit and flightpack actions;
    actions_items.dmi contains minor item-specific actions such as the hierophant club and jetboots;
    actions_mecha.dmi contains actions related to mechs;
    actions_minor_antag.dmi contains antag-related actions with no other spot, like devils/abductors;
    actions_revenant.dmi contains revenant ability icons;
    actions_silicon.dmi contains minor silicon and console icons, like pAI and xenobiology consoles;
    actions_slime.dmi contains slime actions;
    actions_spells.dmi contains icons for all spells;
    actions_xeno.dmi contains icons for all xeno actions; and
    backgrounds.dmi contains backgrounds for the action buttons.
2017-08-01 14:26:42 +12:00
shizcalev
1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
Jordan Brown
bb99546907 Merge pull request #29582 2017-07-31 09:50:57 -04:00
Joan Lung
9c323d97a5 Cyborgs grabbing ore works consistently (#29577)
* Cyborgs grabbing ore works consistently

* i am very chaotic but I fix my shit
2017-07-31 14:09:27 +02:00
pubby
5ebc26b053 Update labor camp stacker accepted sheets. 2017-07-30 09:03:11 -05:00
Cyberboss
84b1115d12 Merge pull request #29549 2017-07-29 20:41:05 -04:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
Joan Lung
2b81912dec Fixes scythes cutting kudzu 2017-07-27 20:41:13 -04:00
shizcalev
0559af385f mining closets 2017-07-25 23:28:10 -04:00
Joan Lung
6d7e3f2281 Lava is no longer a plating subtype (#29463) 2017-07-25 22:16:02 -03:00
Leo
82f7b0c8c5 Merge pull request #29385 from tgstation/Cyberboss-patch-2
Adds logging for the blood contract
2017-07-21 20:27:45 -03:00
Leo
e677813a93 Merge pull request #29401 from Xhuis/satchel_fix
Ore satchels no longer have infinite capacity
2017-07-21 20:20:41 -03:00
Joan Lung
9afefa0064 The blood-drunk miner will fire its KA a bit more often (#29378)
* The blood-drunk miner will actually fire its KA a bit more often

* this too

* )

* k
2017-07-20 18:47:45 -05:00
Xhuis
a3178652d6 Ore satchels no longer have infinite capacity 2017-07-20 12:37:26 -04:00
Jordan Brown
5b0e0d5f96 Adds logging for the blood contract 2017-07-19 19:32:26 -04:00
Ashe Higgs
6624d353e5 Picking up ores by crossing them no longer spams your chat box (#29323) 2017-07-18 21:24:21 -03:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Emmett Gaines
1d201939ba [Ready] Shuttle dock() rewrite (#29049)
A complete rewrite of the dock proc for shuttles to make it more maintainable and readable and also bring over some new features while we're at it. This allows for multi-area shuttles and more control over the effects of anything being moved.

Areas, and movable atoms all have (before|on|after)ShuttleMove procs, turfs have (from|to)ShuttleMove procs which are called the same as beforeShuttleMove.

All ShuttleMove procs have been moved to a single file in the shuttle module.

Stationary docks will have their baseturf_type and area_type modified in maps once the problems have been worked out.
2017-07-17 12:17:56 +12:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
Joan Lung
2370e8c872 Fixes cleave conditions for the cleaving saw 2017-07-12 19:38:05 -04:00
Ashe Higgs
77f8b362fc Adds a 'nemesis faction' system to transforming weapons (#28826)
* Minor generalizations of the cleaving saw

* Some fixes and refactors

* Update transforming.dm
2017-07-12 17:02:52 -04:00
Jordan Brown
d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Jordan Brown
d4e5cfd5a3 Merge pull request #29140 from ChangelingRain/integrity
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
Joan Lung
ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
Joan Lung
9e3e8e9df6 Fixes entire stacks of goliath plates being used on mechs (#29127) 2017-07-09 08:44:27 -03:00
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
kevinz000
0ad378a7bb Actually fixes wormhole jaunters, and no it was not my fault. (#28998) 2017-07-06 22:15:35 -03:00
Leo
a43ba99207 Merge pull request #29061 from ChangelingRain/warpeffect
Warp cubes are slightly less instant but way cooler
2017-07-06 22:12:21 -03:00
shizcalev
d83f85184a lowercased computer names 2017-07-05 19:18:00 -04:00
Joan Lung
f6c1d03805 Warp cubes are slightly less instant but way cooler 2017-07-05 18:02:05 -04:00
Joan Lung
888b2e093e Makes the lavaland pressure check a proc (#28954)
* Makes the lavaland pressure check a proc

* code that probably did nothing tm

* sss

* 50 should be a define instead
2017-07-02 20:14:42 -04:00
Joan Lung
a110e881ad Adds the blood-drunk miner as a potential mining "mini" boss (#28829) 2017-06-30 22:39:49 -03:00
Joan Lung
9dbe3253d0 Adds some neat tiles and walls for use on lavaland (#28760)
* Adds some neat tiles and walls for use on lavaland

* heh

* these, too

* misflip
2017-06-26 11:18:51 -03:00
KorPhaeron
060b767a47 Ninja Dash (#28644) 2017-06-26 10:57:12 -03:00
Joan Lung
601ad4beda Adds the Cleaving Saw as what will be the reward for killing a miniboss (#28565)
* Adds the Cleaving Saw as what will be a reward for killing a miniboss

* slashslice

* wowduh

* some tweaks

* bleed!

* a little slower

* Smaller cleave, higher damage

* more info

* saw icon

* It's finally dooooone!

* done
2017-06-25 12:49:32 -04:00
Joan Lung
70e712017e Status effects start processing immediately instead of on the next timer subsystem tick (#28747)
* Status effects start processing immediately instead of on the next timer subsystem tick

* let's fix this while we're at it

* hup

* not technically efficient but better than not updating when needed
2017-06-25 12:47:10 -04:00
Jordan Brown
37e00d62bd Merge pull request #28716 from lzimann/offhand
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once
2017-06-23 15:07:37 -04:00
kevinz000
13ec788a50 fixes wormhole jaunters (#28706)
* Update wormhole_jaunter.dm

* Don't feel like waiting for @kevinz000 to do this
2017-06-23 15:01:36 -04:00
Jordan Brown
06c22a1e40 Merge pull request #28714 from ChangelingRain/crusherlighting
Fixes the kinetic crusher not emitting light
2017-06-23 14:49:13 -04:00
Lzimann
88816aae12 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being
qdelled many times.
2017-06-22 16:32:24 -03:00
Joan Lung
fdbfe9bd9d Fixes the kinetic crusher not emitting light 2017-06-22 15:10:06 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Joan Lung
58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
bgobandit
078a1e45a6 Lavaland mushrooms and plants can now be cultivated. (#28533) 2017-06-20 20:05:31 -03:00