Commit Graph

2691 Commits

Author SHA1 Message Date
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Joan Lung ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
Leo e5fb32e96b Merge pull request #29274 from kevinz000/patch-254
Minor instrument code cleanup
2017-07-17 09:14:31 -03:00
kevinz000 0833a9002f Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#29277)
* multiext

* instruments

* kekkles

* clown

* Update instruments.dm

* Update packs.dm

* Update packs.dm

* Update instruments.dm

* Update action.dm

* typo

* Update instruments.dm
2017-07-16 12:48:51 -04:00
Leo ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
Jordan Brown bf4373958e Merge pull request #29233 from optimumtact/bumped
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
ShizCalev db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
kevinz000 b3e62c530a Update musician.dm 2017-07-14 18:09:48 -07: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
kevinz000 e461c3add5 Makes showers clean WASHABLE_COLOUR_PRIORITY (#29170)
Makes showers clean WASHABLE_COLOUR_PRIORITY
2017-07-14 11:39:20 -04:00
AnturK d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
kevinz000 876bc2d92d Adds a "synthesizer" that's basically a handheld piano (#29197)
* Update instruments.dm

* Update personal.dm

* Update personal.dm

* nicbn sprites

* icon pathing
2017-07-12 23:24:09 -04:00
Leo 9171a94566 Merge pull request #29196 from kevinz000/patch-249
Raises max lines for piano from 50 to 300
2017-07-12 14:59:33 -03:00
Jordan Brown 78a2e5c4c3 Adds the hivebot invasion event (#28514)
Follow up to #23398

Xhuis & Cyberboss
add: New hivebot invasion event
2017-07-12 13:09:06 +12:00
ShizCalev c79aeb9cc0 Var cleanup (#29168) 2017-07-11 16:32:32 -03:00
Jordan Brown 9e24281c36 Merge pull request #29167 from ShizCalev/box-vent-mapping
[Box] Removes stray fan in engineering
2017-07-11 13:00:26 -04:00
kevinz000 aa04c8c76c Update musician.dm 2017-07-11 06:28:22 -07: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 c88d9fb9c9 removed anchored emcloset desc 2017-07-10 11:46:27 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
shizcalev efef14d1bb Updated closet name 2017-07-10 01:48:00 -04:00
shizcalev 30e0d4b270 [Box] Removes stray fan in engineering
fixes #28862
2017-07-10 01:22:40 -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
MoreRobustThanYou b96bc440db Fixes plasma glass merging with normal glass (#29114)
* Fixes plasma glass merging with normal glass

* Update window.dm

* Update smelting_designs.dm
2017-07-08 10:44:32 -04:00
Jordan Brown e89408c15e Merge pull request #29112 from MoreRobustThanYou/patch-4
Reinforced Plasma Glass is more SME-worthy
2017-07-08 10:43:57 -04:00
Joan Lung bbdfed3c2a Dreams while sleeping are now slightly longer on average and will contain more possibilities (#29104)
* Dreams while sleeping are now slightly longer on average and will contain more possibilities

* I don't think this is worth it at all but sure whatever

* are you dreaming too

* dream
2017-07-07 22:17:57 -04:00
MoreRobustThanYou 6c31809bf0 Update window.dm 2017-07-07 15:11:53 -04:00
MoreRobustThanYou cdde74d82b Update window.dm 2017-07-07 14:16:03 -04:00
MoreRobustThanYou f97f0afa7f Update window.dm 2017-07-07 09:18:54 -04:00
MoreRobustThanYou 289567a2f1 Update window.dm 2017-07-07 08:30:04 -04:00
MoreRobustThanYou 70f1f9a40d Update window.dm 2017-07-07 08:22:33 -04:00
MoreRobustThanYou 30c00659a9 Update window.dm 2017-07-07 07:56:23 -04:00
MoreRobustThanYou c172578fda Ups the intergrity of reinforced plasma windows
They need to be SME-worthy
2017-07-07 07:48:55 -04:00
Joan Lung ddeab5f6e3 Windows now have the proper starting health 2017-07-06 17:44:50 -04:00
Jordan Brown ce590cd648 Fixes windows not returning an Initialize hint (#29038) 2017-07-06 13:03:23 -03:00
Jordan Brown 691ba8d67f Removes the need for specifying obj_integrity (#29030) 2017-07-06 11:23:38 -03:00
ShizCalev c950cb88d4 Replaces highpressure windows with plasma windows (#29051)
* replaces windows

* replaces all instances of highpressure windows

* spacing cleanup
2017-07-06 10:11:44 -04:00
Jordan Brown 94b2134db1 Merge pull request #29050 from ShizCalev/plasma-window-fix
Fixes plasma window sprite
2017-07-06 10:10:54 -04:00
Shadowlight213 91c92c788c Gives ghost roles their own assigned_roles (#29044)
* Gives ghost roles their own assigned_role in mind.

* vars

* skeleton
2017-07-05 20:45:48 -04:00
shizcalev 059d6375ee why were r-plasma windows named that 2017-07-05 01:17:11 -04:00
shizcalev 08808ff7b7 fixes plasma window sprite 2017-07-05 00:52:06 -04:00
Steelpoint c3b00bce43 [Ancient Station] First Round Of Changes/Additions (#28843)
* InitialCommit

* BannersAndFixes

* NewChanges

* FinalChanges

* InitializeFix

* Typo

* MinorFixes

* MoreFixes
2017-07-05 00:22:16 -04:00
MoreRobustThanYou aa7c60eb1f Ports plasma glass windows from /vg/ (#29024)
* add plasma window textures

* plasma glass sheets

* Update glass.dm

* Update window.dm

* Whoops!

* Update glass.dm

* Update glass.dm

* UHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH

* this is what I get for coding while being awake for nearly 24 hours

* SMOOTHIES

* Update window.dm

* return return RETURN

* who cares

for some reason paperframes had trues and all that... i hate byond

* updated dmi snoothie thins

* Add files via upload

* thanks @Cyberboss- thump... zzzzzzzzzzz

seriously i am so tired right now

* AYYYy yayyy I SAID YEAHHHH, what's GOIN ONN

* Update glass.dm

* EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

* ooga booga

* Update window.dm

* Update smelting_designs.dm

* Update smelting_designs.dm

* Update glass.dm

* Update window.dm

* Update glass.dm

* reee

* WHOOPS!

* Well, if ya say so

* Update glass.dm

* Update glass.dm

* uhhh....?

* Update window.dm

* Update glass.dm

* Add files via upload

* Update window.dm

* Update glass.dm
2017-07-04 22:27:58 -04:00
oranges ae3740d84b use_power var now uses a define to reflect it not being a bool
NO_POWER_USE
IDLE_POWER_USE
ACTIVE_POWER_USE

holopads now correctly set use_power and the active_power_usage
2017-06-29 23:50:16 +00:00
Joan Lung d165ecc6f2 Rethemes the Necropolis (#28857)
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks
2017-06-27 18:49:30 -03:00
Jordan Brown dfc5a47c7e Merge pull request #28765 from KorPhaeron/tree
Small jungle trees
2017-06-26 10:41:52 -04:00
KorPhaeron 1fde4943b5 Initialize 2017-06-26 10:13:25 -04:00
KorPhaeron f5a1ce0492 Uses the proper icon file 2017-06-26 09:29:52 -04:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00