Commit Graph

1280 Commits

Author SHA1 Message Date
oranges
f700cb6331 Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
2017-10-05 21:05:16 +13:00
ninjanomnom
436bffbb77 move shuttleRotate into the shuttle module 2017-10-04 02:54:13 -04:00
YPO
935a5497a4 Merge branch 'master' into jaunterfix 2017-10-03 17:44:45 -06:00
YPO
b9b86afd06 Fixes jaunters chasm-saving feature 2017-10-03 17:16:49 -06:00
KorPhaeron
380413fb8b Ports dash weapons to the dash datum (#31222)
* Dash katanas

* Properly assign the action

* Speaking of copypaste

* Its own file
2017-10-04 12:10:39 +13:00
KorPhaeron
cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
bawhoppen
3e4d747b77 Adds desc to things lacking them. (#31086)
* Desc change

* Update girders.dm

* Update valve.dm

* Update machine_stacking.dm

* Update shuttle_engines.dm

* Update pipe_dispenser.dm

* Update lib_items.dm
2017-10-02 09:07:10 +13:00
kingofkosmos
086d636b17 Alt-clicking descriptions when examining (#30988)
* Adds what alt-clicking does into examine-messages.

* whoops fix

* AI holopad examine remove

* Fixed cigarette pack alt-clicking.

* Spear alt-click-message set to show only if explosive lance.
2017-09-29 15:51:31 +13:00
ShizCalev
79eeed829e Makes the mining vendor give more verbose feedback 2017-09-26 23:29:46 -04:00
AnturK
292638c209 Specifies one format of variable declaration for the codebase. (#30926)
* Removes occurences of var name

* Contributing note

* note fixup
2017-09-22 13:43:52 -04:00
Cyberboss
8109e26c09 Merge pull request #30823 2017-09-17 21:08:21 -04:00
shizcalev
81e5154a70 Various grammar fixes 2017-09-17 01:46:41 -04:00
KorPhaeron
1eb9a759a3 Proper use of var names 2017-09-16 20:15:15 -05:00
KorPhaeron
379c2f48f7 Fixes the magic ladder 2017-09-16 20:11:48 -05:00
vuonojenmustaturska
6e468720ab Fixes to more Initialize procs (#30641)
* batch 1

/mob/living/silicon/robot/syndicate
/obj/effect/decal/cleanable/blood/old
/obj/effect/decal/cleanable/blood/gibs
/obj/effect/decal/cleanable/blood/gibs/old
/obj/effect/decal/cleanable/ash
/obj/effect/decal/cleanable/ash/large
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/vomit/old
/obj/effect/decal/cleanable/shreds
/obj/effect/decal/cleanable/oil
/obj/effect/decal/cleanable/crayon
/obj/effect/decal/cleanable
/obj/effect/temp_visual/point

* batch 2

/obj/effect/anomaly
/mob/living/carbon/monkey/punpun
/obj/item/queen_bee/bought
/mob/living/simple_animal/hostile/poison/bees
/mob/living/carbon/human
/area/ai_monitored
/area

* batch 3

/mob/living/simple_animal/hostile/blob/blobspore
/obj/item/spellbook
/mob/living/simple_animal/hostile/blob/blobbernaut
/mob/camera/blob
/obj/structure/noticeboard
/obj/structure/piano
/obj/item/clothing/head/helmet
/obj/item/gun/energy/laser/chameleon

* batch 4

/obj/machinery/airalarm
/obj/effect/decal/cleanable for reals
/obj/item/stack/rods
/obj/effect/decal/cleanable/crayon for reals
/obj/screen/parallax_layer
/obj/item/device/instrument
/obj/item/ore
/obj/item/coin

* batch 5, getting tgstation ready for halloween

/obj/machinery/meter/turf
/obj/machinery/capture_the_flag
/obj/effect/ctf/dead_barricade
/obj/structure/firepit
/obj/item/clothing/head/helmet/knight
/obj/structure/spacevine
/obj/effect/hallucination/simple/xeno
/obj/effect/hallucination/simple
/mob/living/simple_animal/shade/howling_ghost
/mob/living/simple_animal/hostile/retaliate/clown/insane
/obj/structure/bookcase
/mob/camera/aiEye/remote/base_construction
/obj/machinery/computer/camera_advanced/base_construction
/obj/item/device/wisp_lantern

* batch 6

/obj/item/device/warp_cube/red
/obj/item/device/shared_storage/red
/obj/item/melee/ghost_sword
/mob/living/simple_animal/hostile/mining_drone
/mob/living/brain
/obj/item/device/mmi/posibrain
/mob/living/carbon/human/interactive
/mob/living/carbon/human/interactive/angry
/mob/living/carbon/human/interactive/friendly
/mob/living/carbon/human/interactive/greytide
/mob/living/carbon/human/interactive/robust
/mob/living/carbon/monkey/angry
/mob/living/simple_animal/hostile/guardian/assassin
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech
/mob/living/simple_animal/hostile/syndicate/mecha_pilot
/mob/living/simple_animal/hostile/mimic/crate
/mob/living/simple_animal/hostile/mimic/copy

* batch 7

/mob/living/simple_animal/hostile/megafauna/colossus
/mob/living/simple_animal/hostile/megafauna/bubblegum
/mob/living/simple_animal/hostile/asteroid/goldgrub
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
/mob/living/simple_animal/hostile/asteroid/hivelordbrood
/mob/living/simple_animal/hostile/statue
/mob/living/simple_animal/hostile/wizard
/obj/machinery/power/smes
2017-09-13 02:47:17 -04:00
Joan Lung
b00258e896 Makes shiny versions of lavaland monsters slightly more distinct (#30502)
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
2017-09-11 21:54:09 -04:00
KorPhaeron
b5071a14d1 And now we have extra parenthesis 2017-09-11 13:23:38 -05:00
KorPhaeron
7ee271752e Missed some parentheses 2017-09-11 13:18:30 -05:00
KorPhaeron
10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
Jordan Brown
56b7d229cc Merge pull request #30548 2017-09-11 13:37:52 -04:00
KorPhaeron
7c553c6d80 Span 2017-09-11 10:07:49 -05:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
KorPhaeron
0dd3338881 Magic Ladder 2017-09-09 14:47:43 -05:00
Ashe Higgs
ae2b8e00ec Adds a unique suicide to the hierophant club, plus some attack verbs (#30400)
* Adds a suicide to the hierophant club

* Above

* good point

* Removes the delay
2017-09-07 11:00:38 -04:00
Jordan Brown
2c92735520 Port material containers to datum components (#29268)
* Ports /vg/'s component system

* Fix component signalling itself for addition

* Fix the list arrangement for removal

* Whoops

* Return the existing component if the created one was deleted

* These can't be ints

* ,

* returning TRUE from a callback will mark the event as handled

* Small refactor

* Add powered components

* R e f a c t o r

* More wip

* Fixes et al

* Pure pain

* When bae tells you she was tabs but she was actually spaces

* RReee

* Needs arglist

* Fax

* Fax

* More better

* You fail me yet again git commit

* Some kajiggering, but there we go

* No more 3rd param = variadic

* fix

* Sanity

* Whoops

* Minor thing

* Whoops

* fax

* Better describe the function, + add ..()s

* Fix

* Port to Initialize

* fuk in git
2017-08-30 15:11:34 +02:00
shizcalev
b946003be3 Fixes survival_pods being a valid_territory 2017-08-25 20:48:03 -04:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Xhuis
da80f72dde throw it at him, not me! 2017-08-12 02:11:51 -04:00
Xhuis
a57adb7b49 Fixes minebots missing action icons 2017-08-12 02:09:43 -04:00
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