Commit Graph
1217 Commits
Author SHA1 Message Date
Tad HardestyandShizCalev 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
orangesandGitHub f700cb6331 Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
2017-10-05 21:05:16 +13:00
orangesandGitHub a47dc83a1b Merge pull request #31275 from kingofkosmos/moredeconhints
Adds deconstruction hints to various things
2017-10-05 10:33:09 +13:00
kevinz000andKorPhaeron aeadbceb27 why plus a minus value and not just minus the value... (#31279)
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
2017-10-04 14:02:44 -05:00
ninjanomnom 436bffbb77 move shuttleRotate into the shuttle module 2017-10-04 02:54:13 -04:00
kingofkosmos 2e63bd3dbe Adds deconstruction hints for beds, chairs, closets, grilles, lattices, catwalks, tables, racks, floors, plating and the bookcase. Plus few span fixes. 2017-10-03 18:39:07 +03:00
LeoandGitHub f4dd50156e Merge pull request #31233 from kevinz000/patch-306
Fixes floating bullet holes
2017-10-03 08:18:02 -03:00
vuonojenmustaturskaandAnturK d1a1495925 makes /turf/Enter() faster, and also makes CollidedWith async (#31217)
* makes /turf/Enter faster, maybe

* waitfor false on atom/collidedwith
2017-10-03 11:32:58 +02:00
kevinz000andGitHub 1a360a971c Update closed.dm 2017-10-02 03:12:52 -07:00
KorPhaeronandJoan Lung cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
Jordan BrownandGitHub 117cf2ee8b Merge pull request #31149 from kingofkosmos/nolegsbucklefix
Held items drop when falling over for not having legs
2017-10-01 10:29:07 -04:00
kevinz000andKorPhaeron 44261f5117 Update closed.dm 2017-10-01 08:42:24 -05:00
kingofkosmosandJoan Lung 6a1bb42630 You can now examine an airlock to find out how to construct/deconstruct it (#30605)
* Tweaks rwall construction examine-messages.

* Tweaks window construction examine-messages.

* Added airlock construction examine messages.

* Typo fix.

* Shortened the airlock electronics circuit message.

* Fixed examine text styles.

* Fixes.

* Fixed wall-examine showing on rwalls.

* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.

* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.

* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.

* Removed unnecessary rwall-examine.

* Sound full path.
2017-10-01 01:03:43 -04:00
kingofkosmos a0b6dc5924 Makes mob drop held items when falling over from not having legs. 2017-09-30 12:44:00 +03:00
Joan Lungandoranges 5b73196dac Reebe is fancier now (#31045)
* Reebe is fancier now

* proper wall baseturf
2017-09-29 15:58:45 +13:00
KorPhaeronandoranges 338f7f2a2b Shooting walls can create bullet holes/dents (#30714)
* Bullet holes in walls

* Code standards, new sprite
2017-09-29 15:46:59 +13:00
Jordan Brownandoranges 4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
Emmett GainesandLeo 074e4ae88c GetAllContents performance increase (#31027) 2017-09-27 22:30:48 -03:00
Ashe Higgsandoranges 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
vuonojenmustaturskaandoranges f14c7191a5 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart (#30980)
* Small initialize fix batch

/mob/living/simple_animal/parrot/Poly/ghost
/obj/effect/spawner/bundle
/obj/item/device/radio/headset/headset_sec/alt/department
/obj/effect/mob_spawn/human/golem
/obj/item/device/radio/headset/abductor
/obj/item/nullrod/tribal_knife
/obj/effect/spawner/xeno_egg_delivery
/turf/open/chasm/straight_down

* Requested changes
2017-09-25 11:41:48 +13:00
vuonojenmustaturskaandJordan Brown 772924ba38 More Initialize() fixes, requires someone to test with DB (#30831)
* Batch 1

/obj/item/storage/firstaid/fire
/obj/structure/bookcase
/obj/item/book/random QDEL, not actually in the logs but returned wrong hint
/obj/effect/landmark/start/wizard QDEL
/obj/effect/landmark/start/wizard
/obj/effect/landmark/start/new_player
/obj/effect/landmark/latejoin
/obj/effect/landmark/xeno_spawn
/obj/effect/landmark/blobstart
/obj/effect/landmark/secequipment
/obj/effect/landmark/prisonwarp
/obj/effect/landmark/ert_spawn
/obj/effect/landmark/holding_facility
/obj/effect/landmark/thunderdome/observe
/obj/effect/landmark/thunderdome/one
/obj/effect/landmark/thunderdome/two
/obj/effect/landmark/thunderdome/admin

* Batch 2

/obj/machinery/computer/operating
/obj/machinery/computer/telecrystals/uplinker
/obj/item/card/id/centcom
/obj/item/card/id/syndicate
/obj/item/card/id/captains_spare
/obj/item/card/id/ert
/obj/item/card/id/ert/Security
/obj/item/card/id/ert/Engineer
/obj/item/card/id/ert/Medical
/obj/structure/trap
/obj/machinery/magnetic_controller
/obj/item/storage/toolbox
/obj/structure/table

* Batch 3

/obj/machinery/vending/snack/random
/obj/machinery/vending/cola/random
/obj/machinery/computer/pod
/obj/machinery/computer/message_monitor
/obj/machinery/computer/atmos_control
/obj/item/implanter
/obj/item/implantcase
/obj/item/construction
/turf/open/floor/grass
/turf/open/floor/grass/snow/basalt
/turf/open/floor/grass/fakebasalt
/turf/open/floor/carpet
/turf/open/floor/fakespace
/turf/open/floor/light
/turf/open/floor/mineral
/turf/open/floor/mineral/abductor
/turf/open/floor/circuit
/turf/open/floor/clockwork
/turf/open/floor/plating
/turf/open/floor/engine/cult

* Batch 4

/obj/item/storage/backpack/satchel/flat
/obj/item/storage/backpack/satchel/flat/secret
/turf/closed/indestructible/fakeglass
/turf/closed/mineral/random
/turf/closed/mineral/gibtonite
/turf/closed/mineral
/turf/open/floor
/obj/effect/spawner/lootdrop

* Batch 5

/obj/effect/spawner/lootdrop/maintenance
/obj/effect/spawner/lootdrop/costume
/obj/item/toy/eightball/broken
/obj/item/toy/eightball
/obj/item/toy/eightball/haunted
/obj/item/device/electropack
/obj/item/restraints/legcuffs/beartrap
/obj/machinery/airlock_sensor
/obj/item/storage/box/ingredients

* Batch 6

/mob/living/simple_animal/hostile/carp/ranged
/obj/structure/lattice/clockwork
/obj/structure/lattice/clockwork/large
/obj/structure/lattice/catwalk/clockwork
/mob/living/simple_animal/hostile/mushroom
/mob/living/carbon/alien
/mob/living/carbon/alien/larva
/mob/living/carbon/alien/humanoid
/mob/living/carbon/alien/humanoid/drone
/mob/living/carbon/alien/humanoid/royal/praetorian
/mob/living/carbon/alien/humanoid/sentinel
2017-09-19 08:45:18 -04:00
Kyle Spier-SwensonandGitHub ae3c027444 Maybe fix shuttle issues
Somebody download this branch and test it out, i'm at work
2017-09-16 16:46:02 -07:00
vuonojenmustaturskaandJordan Brown c35db0ec80 Removes vine floors and their sprite (#30778)
* removes vine floors and their sprite

* Once more, with feeling

* Revert "Merge branch 'kudzufix' of https://github.com/vuonojenmustaturska/tgstation into kudzufix"

This reverts commit 89d99caa75dcadabebdf44a6e4b6c40b2914156a, reversing
changes made to 92e89ed02b767b927a83ee3a878b6eb38f590c5c.
2017-09-16 16:01:13 -04:00
shizcalevandKorPhaeron e7cf1e3115 Corrects killroom turf gas mixture 2017-09-16 14:57:54 -05:00
MoreRobustThanYouandoranges dad5bb6e00 Ports chasm exceptions to typecaches (#30717)
* Ports chasm exceptions to typecaches
2017-09-15 11:11:56 +12:00
ExcessiveUseOfCobblestoneandJordan Brown b79a9b557b Turfs call ..() in attackby (#30707)
* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* ok this works

* ok this works
2017-09-14 12:24:21 -04:00
Kyle Spier-SwensonandAnturK f860464b62 Fixes lighting hard deleting (#30684) 2017-09-14 12:20:28 +02:00
ExcessiveUseOfCobblestoneandJordan Brown 8730cf2fa9 Fixes Archaeology not working (#30547)
* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil
2017-09-13 15:03:44 -04:00
Joan LungandJordan Brown 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
ExcessiveUseOfCobblestoneandJordan Brown 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
tortellinitonyandKorPhaeron 224075694b Gets rid of manual overlay manipulation (#30454) 2017-09-06 23:38:24 -05:00
AnturK 76d68971d4 Fixes airless shuttles 2017-09-02 19:43:53 +02:00
Cyberboss 3dd1c855f8 Merge pull request #30266 2017-08-30 18:03:44 -04:00
ShizCalevandoranges 2ec3125105 Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it (#29859)
* Planet Z helper - fixed conflict

* Removed the digging part

* Tidied up.

* Requested changes mk2
2017-08-30 10:10:42 +12:00
orangesandGitHub 66302ed845 Merge pull request #30244 from tgstation/Cyberboss-patch-4
Workaround to prevent slippery components from flooding SSgarbage
2017-08-30 10:08:47 +12:00
Jordan Brown 1a8f942004 Merge pull request #30243 2017-08-29 10:44:22 -04:00
KorPhaeron d2659b327e Sound 2017-08-29 10:17:24 -04:00
KorPhaeron 479c18f13c Ceiling Broke 2017-08-28 23:32:21 -04:00
Cyberboss bcc4b36988 Merge pull request #30225 2017-08-27 19:28:07 -04:00
Joan LungandJordan Brown 9556b8edc9 Removes the suppose-to-be unused shuttle wall path (#30214)
* Removes the unused shuttle wall path

* snip SNIP

* SNIP snip

* SNIP
2017-08-27 19:25:30 -04:00
Jordan BrownandGitHub cbd0bdb937 Workaround to prevent slippery components from flooding SSgarbage 2017-08-27 18:53:45 -04:00
Joan Lung 1ef530e271 Wet turfs on shuttles will remain wet after shuttle movement 2017-08-27 17:59:19 -04:00
ShizCalevandAnturK 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
shizcalev 557b29cb7f Switched dirtystation to use typecaches for checks 2017-08-26 19:44:24 -04:00
kevinz000andGitHub 169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
MoreRobustThanYouandoranges 0a530cff9c Refactors forensics to a datum (#29542)
* ports plasmeme windows from /vg/

* Update window.dm

* It's the stairway to seinfield

* fixity fix fix

* See this code if you're wondering why I rarely get any sleep

* *scream

* now

* this is going to give me PTCSD - post-traumatic coding stress disorder

* *scream

* Improves forensics datum

* Meep.

* RA RA RASPTUIN... i'm not crazy, right?

* better

* I think it works... /s

* less compile errors

* Reduces compile errors to a much more managable 50

* shitcode.exe

* ehhh

* HEY EVERYONE, IT WORKS!!

* Make slide code less autistic

* blue skyyy

* no more bay forensics!

* IT  WORKS

* Remove EnforceSize, it isn't used.

* icon2html

* More bicon sutff

* eee

* aeee

* abc

* abc

* a

* abc

* e

* forensics check in initalize

* huh

* bleh

* Update _drone.dm

* Update _drone.dm

* Update _drone.dm
2017-08-24 09:08:22 +12:00
Ashe HiggsandGitHub 7202ee664b Merge branch 'master' into content_dump_fix 2017-08-22 13:28:38 -04:00
Xhuis 46fcca9972 Content dumping IN SPAAAAAAACE 2017-08-22 13:27:59 -04:00