Commit Graph

1072 Commits

Author SHA1 Message Date
ShizCalev 922422a159 Window Spawners mk2 (#29792) 2017-08-10 08:17:30 -03:00
Jordan Brown 3c56d0f4f3 Ports duplicated slipping code to a component (#29628)
* Ports duplicated slipping code to a component

* Makes metal not slippery

* asdf

* Instead of cherry picking like an idiot I could just copy paster

* OOP

* And blood, don't forget Fry's blood!

* Further fixes

* A more generic fashion

* Use the new system

* Fixes

* Fix cartridge type

* Remove inertia
2017-08-09 16:06:15 +02:00
Jordan Brown d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
Jordan Brown 5c696a582d Merge pull request #29756 2017-08-08 09:59:07 -04:00
Jordan Brown 0c1aa057d8 Merge pull request #29766 2017-08-08 09:59:03 -04:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
shizcalev 7715f9497e Have you heard the story of the rogue drone? 2017-08-07 18:44:52 -04:00
Joan Lung 91ef47fb8f just that 2017-08-07 11:42:37 -04:00
Joan Lung 26da0f40b5 Belligerent now has a visible indicator 2017-08-07 11:39:03 -04:00
FrozenGuy5 e28634eb91 initaliazieizlie 2017-08-05 01:57:54 +01:00
oranges 6b6fc91172 Merge pull request #29623 from Cyberboss/TiredOfBS
Removes all checks for subsystem existence
2017-08-04 23:54:47 +12:00
ShizCalev 1ca932278f Tweaked SM overlay (#29645) 2017-08-03 10:42:38 -04:00
ShizCalev b3a2721590 Window Spawners (#29634) 2017-08-02 10:11:07 -04:00
Jordan Brown 6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
Jordan Brown 6175ab77d5 Removes all checks for subsystem existence 2017-08-01 10:16:37 -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
Jordan Brown 20d8f32096 Merge pull request #29484 2017-07-31 09:52:59 -04:00
XDTM 97fc07898c Merge branch 'master' into Hallucinations3.0 2017-07-29 12:43:18 +02:00
Qustinnus 7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +02:00
Joan Lung 13e0b4190c Merge branch 'master' of https://github.com/tgstation/tgstation into geisrework
Conflicts:
	code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
2017-07-28 20:19:42 -04:00
Joan Lung eda1a04b7f Clockcult combat changes (#29326)
* Clockcult combat changes

* boom

* nah, less

* text changes

* compile

* more compile
2017-07-28 20:45:36 -03:00
Joan Lung 7209d00170 Sigils of Transmission can now drain power, but Interdiction Lenses have been removed (#29221)
* Sigils of Transmission can now drain power, but Interdiction Lenses have been removed

* bleh

* lensless

* mlem
2017-07-28 20:45:03 -03:00
Jordan Brown 4a885018a6 Merge pull request #29533 2017-07-28 09:56:03 -04:00
shizcalev 719612ba3b ALLOW ME TO BREAK THE ICE 2017-07-26 20:44:42 -04:00
shizcalev 065bda1cc2 things 2017-07-25 22:26:51 -04:00
Joan Lung 6d7e3f2281 Lava is no longer a plating subtype (#29463) 2017-07-25 22:16:02 -03:00
Joan Lung 60e6580495 things I thought I fixed 2017-07-24 17:46:06 -04:00
Joan Lung 5b48b94c6f Reworks Clockcult's standard conversion method, removes Taunting Tirade 2017-07-24 17:16:08 -04:00
Qustinnus 2312ff09be Fixing conflicts 2017-07-19 11:19:52 +02:00
XDTM 1c716c2f0f Merge branch 'master' into Hallucinations3.0 2017-07-18 22:04:13 +02: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
XDTM 5fafc73094 Hallucinations 3.0 2017-07-15 21:03:34 +02:00
Jordan Brown bf4373958e Merge pull request #29233 from optimumtact/bumped
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
Fox McCloud 2cc3e9c41f Disease Refactor (#29130)
* Vomit Now Contains Viruses

* eh

* typeless memery

* Disease Refactor

* tweaks

* styling

* tweaks

* unecessary comment removal

* whoops

* fix
2017-07-15 11:08:40 -04:00
oranges e04fd83b9d Rename Bumped to CollidedWith
In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
2017-07-15 00:25:22 +00:00
oranges 5494f5328a Rename Bump to Collide (#29207)
This reduces confusion arising from the fact byond already has a built
in byond proc also named Bump.

We used an argument called yes to distinguish our Bump from byond's
builtin bump, but then we failed to make sure everyone of our bumps
properly override it, so a bunch of things have been double bumping

This resolves that issue permanently

I've also removed the second argument as it no longer has a purpose

I also cleaned up the recycler bump as it didn't do anything the
parent procs didn't already do
2017-07-14 13:47:22 +02:00
AnturK d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
kevinz000 7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03: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
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 1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04: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
Joan Lung bea7bf9297 Adds Necropolis curses for cursed items in Necropolis ruins (#28992)
* Adds Necropolis curses for cursed items in Necropolis ruins

* Adds sounds credit @FuryMcFlurry

* stat tweak

* these are painful enough

* a bit stronger

* i kind of wish there was a version of get_ranged_target_turf() that worked off of angle.... but there isn't

* smart coder 2000

* bossed around
2017-07-06 11:14:26 -04:00
Joan Lung f6c1d03805 Warp cubes are slightly less instant but way cooler 2017-07-05 18:02:05 -04:00
kevinz000 62ad647495 Fixes portals not autosetting their overridden target turf on Initialize - "It actually was my fault" (#28999)
* Update portals.dm

* Update portals.dm
2017-07-05 10:36:02 -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
kevinz000 712428ec9c Allows adminspawning of portals (#28896) 2017-06-29 00:53:58 -04:00
Ergovisavi a08aa9e3a2 Fixes resin stacking & allows lasers to pass through resin (#28842)
* Fixes resin stacking
Lets you shoot through Resin with lasers!

* Small code cleanup

* TRUE
2017-06-27 09:29:26 -04:00