Commit Graph

1588 Commits

Author SHA1 Message Date
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
oranges
f700cb6331 Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
2017-10-05 21:05:16 +13:00
Leo
85d717350d Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
2017-10-04 21:25:31 -03:00
ninjanomnom
436bffbb77 move shuttleRotate into the shuttle module 2017-10-04 02:54:13 -04:00
KorPhaeron
72389743db ismachinery define 2017-10-03 18:13:21 -05:00
MoreRobustThanYou
056be96cc6 Blobs now take damage from particle accelerators (#31181)
* Blobs now take damage from particle accelerators

* Update particle.dm
2017-10-04 12:11:49 +13:00
MoreRobustThanYou
8482e30d34 Makes antimatter code less shit (#31219)
* Antimatter shielding that can't find a control unit won't delete itself anymore

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* gthruhru

* thanks Antur
2017-10-03 11:39:41 +02:00
KorPhaeron
cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
ShizCalev
ef5cf0e5a5 Fixes aliums being able to attack the SM crystal 2017-10-01 05:04:13 -05:00
Leo
7d0f9367e8 Merge pull request #31138 from KorPhaeron/isstructure
Structure istype define
2017-09-30 23:31:37 -03:00
ShizCalev
4f4008920f Fixes SM shard extraction (#31111)
* Fixes SM shard extraction

* Space-OSHA called. They want to have a word.
2017-09-29 18:42:40 -05:00
Jordan Brown
74b9e3df0c Fixes PA Href Issue 2017-09-29 17:23:37 -05:00
KorPhaeron
bc142acb5c Structure istype define 2017-09-29 17:19:10 -05:00
Ashe Higgs
b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13:00
AnturK
1304e83a76 Refactors cinematics. (#30888)
* Cinematic  refactor p1

* Refactors cinematics & related fixes

* Fix and cleanup

* Fixes survivor gibbing.

* qdel_null
2017-09-26 22:20:05 +13:00
ShizCalev
9cd4677eb9 Href tokens 2017-09-23 01:00:52 -04:00
oranges
3791f0b443 Merge pull request #30896 from ShizCalev/debug-text
Removes old debug text
2017-09-21 23:29:29 +12:00
Ashe Higgs
3c32c65e7c Gives engineering cyborgs an item they can use in place of circuits for basic construction (#30464)
Adds the electroadaptive pseudocircuit - technobabbly name intended - to engineering cyborgs. They can use this in place of circuit boards during construction of alarms, APCs, and firelocks to create a circuit at the cost of varying amounts of power. There's a brief cooldown between uses to prevent borgs from becoming circuit farms on wheels.

Note that in order to create circuits, you need to cannibalize simple circuits (anything the pseudocircuit can make) to get the material. Each pseudocircuit starts with five circuits by default.

It can also be used on a completed APC frame with no power cell to create an empty, low-capacity power cell in the APC at the cost of 500W of power; this is to allow borgs to repair a broken APC without external aid because the CE won't bring the fucking cell over get over here you brainless fuck.

Code-wise, this just adds extra checks to the frames' attackby procs that do the same thing as the other circuits. Airlock electronics, computer boards, and machine circuits cannot be made using this, and it's only for basic construction purposes.
2017-09-20 21:17:32 +12:00
ShizCalev
39380d5b03 Removes old debug text 2017-09-19 18:56:39 -04: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
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
ExcessiveUseOfCobblestone
1e17bb7b83 Adds Archaeology Component (#30220)
* The future of archaeology

* pirate pad transfer is godawful

* pp transfer, part deus

* Revert "pp transfer, part deus"

This reverts commit f6e48f71f59f834f0b9e02a2ab2bb1bc1bda1b6a.

* hmmm!

* Edits How This Works

* Dig Check

* you can no longer chaindig + MrPerson req

* All MrPersons

* I need to squash soon [tm]

* replaces define

* fixes #literally everything

* forgot why i set it to highlander

* Review

* Removes How2 and Fixes Travis

How2 was outdated so idgaf

* Review 2, Cyberboss Boogaloo

had to move SSblackbox now that W is a more localized var.

* archdrop list is null now

* It won't let me edit that space sorry

* GOTCHA

* yes i used the web editor, no i am not sorry

* cyber

* ..()
2017-09-08 11:01:30 -04:00
AnturK
2814432f90 Fixes containment field CanPass 2017-09-06 14:56:56 +02:00
shizcalev
f39ff97a35 Duplicate var 2017-08-31 23:20:46 -04:00
shizcalev
ae64a284ab Changed to subtypes 2017-08-31 23:20:45 -04:00
shizcalev
ec6e9bb78f Makes APC cell_type actually pick a cell 2017-08-31 23:20:45 -04:00
pubby
6eb61d6f41 Crew monitoring rework part 1: crew pinpointers (#30117)
* Pinpointer refactor + Crew pinpointers

* Icon update

* Add crew pinpointers to maps, closets, and fix

* Fix defines

* Cyberboss fixes + add to warden and CMO

* More Cyberboss fixes
2017-08-30 18:02:28 -04:00
Jordan Brown
9bae1264a5 Merge pull request #30240 2017-08-29 10:44:09 -04:00
shizcalev
2427f217f7 Standardized power displays 2017-08-28 14:22:05 -04:00
Cyberboss
e470aec39a Merge pull request #30204 2017-08-27 19:27:44 -04:00
ShizCalev
7056b38410 Cleaned up environment_smash vars with bitflag defines (#30154)
* Switched to bitflags

* CB's change.

* fixed

* i can spell i swear

* cb2
2017-08-27 12:49:58 +02:00
Joan Lung
36e62c6efe shift the fix 2017-08-26 14:33:32 -04:00
Joan Lung
65146c8a02 Fixes APC pixel shift being off 2017-08-25 23:10:12 -04:00
Jordan Brown
b208a51975 Fixes supermatter sliver objective being given if there is no supermatter engine (#30032)
* Adds /engine variants of supermatter_shard

* Makes maps use /engine supermatter_shard variants

* Adds a framework for ensuring an objective_item exists before giving it as a target

* Fixes supermatter sliver objective being given with no supermatter engine on the map

* Works around BYOND stupidity
2017-08-24 11:39:35 +12:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
nicbn
ab406fbccf Changes smes, cells, cell charger, terminals and apcs icons (#29931)
* 1

* Cell charger shows what's inside

* CONSTRASTE!

* charge! bar

* kindafix offset
2017-08-16 21:02:01 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk
371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
Leo
5fafb4befe Merge pull request #29889 from Cyberboss/MouseOpacityDefines
Adds defines for mouse_opacity
2017-08-15 13:01:28 -03:00
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
shizcalev
bfa0ab7234 Freon singuloth fix 2017-08-13 23:16:30 -04:00
Joan Lung
6cacf125e5 Ports a slightly edited version of Eris APC sprites (#29809) 2017-08-14 10:53:35 +12: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
Jordan Brown
d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00