Jordan Brown
f4e1be467c
Merge pull request #29502
2017-07-27 09:43:16 -04:00
shizcalev
8ebf6b6a43
cleaned up paper
2017-07-26 05:35:05 -04:00
Joan Lung
6d7e3f2281
Lava is no longer a plating subtype ( #29463 )
2017-07-25 22:16:02 -03:00
oranges
b44bb6ffad
Revert "Adds the hivebot invasion event ( #28514 )"
...
This reverts commit 78a2e5c4c3 .
2017-07-25 23:06:38 +00:00
Jordan Brown
26f16d2222
Merge pull request #29476
2017-07-25 16:19:41 -04:00
kevinz000
75d9f8e3fc
Update musician.dm
2017-07-25 04:44:56 -07:00
oranges
ab940008b8
Merge pull request #29454 from ShizCalev/nanotrasen
...
Standardized the corporate name
2017-07-25 09:34:20 +12:00
kevinz000
9e4681fdd8
Update musician.dm
2017-07-24 00:25:07 -07:00
kevinz000
d9a057966d
Update musician.dm
2017-07-24 00:13:10 -07:00
kevinz000
abeda8d408
Update musician.dm
2017-07-23 23:03:53 -07:00
kevinz000
bb37810a4a
Instrument performance update ( #29395 )
...
Scans for hearers every 4 ticks instead of per note.
2017-07-24 10:20:13 +12:00
shizcalev
f31cbb3ac5
Nanotrasen
2017-07-23 04:08:57 -04:00
kevinz000
e99d100c35
Fixes shower runtimes ( #29389 )
...
* Update watercloset.dm
* Update watercloset.dm
* Update watercloset.dm
2017-07-22 20:48:38 +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
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