9e4681fdd8
Update musician.dm
2017-07-24 00:25:07 -07:00
d9a057966d
Update musician.dm
2017-07-24 00:13:10 -07:00
abeda8d408
Update musician.dm
2017-07-23 23:03:53 -07:00
90689ebba1
Merge pull request #29163 from Tacolizard/jim_E_Rustle
...
Prevents the captain's sabre from rustling jimmies
2017-07-24 11:12:42 +12:00
63c5f67dd1
Merge pull request #29431 from Xhuis/sorry_about_that_ii_screwed_it_up
...
Nuke screwdrivers are no longer randomly colored
2017-07-24 10:35:43 +12:00
bb37810a4a
Instrument performance update ( #29395 )
...
Scans for hearers every 4 ticks instead of per note.
2017-07-24 10:20:13 +12:00
f31cbb3ac5
Nanotrasen
2017-07-23 04:08:57 -04:00
e99d100c35
Fixes shower runtimes ( #29389 )
...
* Update watercloset.dm
* Update watercloset.dm
* Update watercloset.dm
2017-07-22 20:48:38 +02:00
a5f4e6c124
Nuke screwdrivers are no longer randomly colored
2017-07-21 21:16:54 -04:00
9123f45eab
Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.) ( #29393 )
2017-07-21 20:25:19 -03:00
e677813a93
Merge pull request #29401 from Xhuis/satchel_fix
...
Ore satchels no longer have infinite capacity
2017-07-21 20:20:41 -03:00
01d9da3da4
Fixes a drone ping issue
2017-07-20 18:16:18 -04:00
a3178652d6
Ore satchels no longer have infinite capacity
2017-07-20 12:37:26 -04:00
fedf7ba7fd
pleases the gods
2017-07-20 17:10:16 +02:00
c48bd7ca08
Adds investigate logs to portals ( #29334 )
...
* Update teleportation.dm
* Update admin_investigate.dm
* Update logging.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
2017-07-20 08:57:46 -04:00
2438bd2aa8
Small belt overlay rewrite, and tool overlays for toolbelts ( #29180 )
...
* Belt overlay tweaks, tool overlays
* Belt overlays now have their own file
* work on porting to the new screwy looks
* Work on screwdrivers
* Fixes screwdrivers
* really SCREWED that one up!
2017-07-19 15:29:35 +01:00
e39d5d871f
me making this port work https://www.oranges.net.nz/~oranges/webm/stuck_pancake.webm
2017-07-19 11:43:55 +02:00
2312ff09be
Fixing conflicts
2017-07-19 11:19:52 +02:00
1c716c2f0f
Merge branch 'master' into Hallucinations3.0
2017-07-18 22:04:13 +02:00
9f2684af41
Merge pull request #29320 from Xhuis/electric_guitar_fix
...
Electric guitars now properly use .ogg sound files
2017-07-18 14:50:25 -04:00
45d3d52af7
Made some object lists less terrible to read ( #29304 )
...
* spaces
* more spaces
* last ones
2017-07-18 10:44:29 -04:00
fea979b46a
Merge pull request #29303 from kevinz000/patch-255
...
Fixes flashbang stun times
2017-07-17 22:13:46 -03:00
30e5070792
Fixes electric guitars
2017-07-17 13:09:50 -04:00
ca06bc22e6
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #29232 )
2017-07-17 12:25:01 -03:00
e5fb32e96b
Merge pull request #29274 from kevinz000/patch-254
...
Minor instrument code cleanup
2017-07-17 09:14:31 -03:00
de3f268385
Merge pull request #29262 from ChangelingRain/rpdtweak
...
RPDs can now place disposals pipes on dense non-wall turfs
2017-07-16 12:50:05 -04:00
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
ca59ca6c23
Changes all access const to be a define ( #29260 )
2017-07-16 18:44:23 +02:00
ce1568190b
Update flashbang.dm
2017-07-16 06:01:44 -07:00
5fafc73094
Hallucinations 3.0
2017-07-15 21:03:34 +02:00
bf4373958e
Merge pull request #29233 from optimumtact/bumped
...
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
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
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
b2665e56da
Merge pull request #29250 from optimumtact/bananabobananafobanana
...
Fix the attackby of the supermatter containment core
2017-07-15 00:45:23 -03:00
b3e62c530a
Update musician.dm
2017-07-14 18:09:48 -07:00
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
6b1bc117e2
as done
2017-07-14 15:40:24 -04:00
2551794b5d
RPDs can now place pipes on walls
2017-07-14 15:25:12 -04:00
e461c3add5
Makes showers clean WASHABLE_COLOUR_PRIORITY ( #29170 )
...
Makes showers clean WASHABLE_COLOUR_PRIORITY
2017-07-14 11:39:20 -04:00
2b053f2a0e
Organ Update [Cloning isn't broken edition] ( #29223 )
...
* initial
* add paranthesis
* add zones
* update DNA
* indent
* descriptions
* start refactor
* update dme
* paranthesis
* remove old proc
* refactor digestion onto stomach
* add handle_liver()
* fix
* add stabiliver
* add a warning for liver failure
* lower frequency of warning message
* switch to prob
* fix permissions
* forgot something
* change recipe
* implement liver damage
* change operator
* fix
* fix
* oh the irony
* rebalance
* refactor alcohol tolerance and add med scanning
* fix
* misc fixes, changes and refactors
* fix?
* remove src
* misc changes
* more bugfix attempts
* Update liver.dm
* Update stomach.dm
* FIXED!!!!
* preparation for rnd organs
* rename var
* string changes
* implement tox filtration
* fix
* fix
* fix
* toxin filtration v2
* misc fix
* fix
* fix
* should not be coding this late at night
* reee
* misc
* fix runtimes
* digest me
* typepeath
* add mutant support
* comment and spacing
* commentz
* typepath
* fixes
* fix?
* fix
* change
* plasmeme organs!
* Update liver.dm
* Update stomach.dm
* stabiliver => corazone
* cyberboss review
* cyberboss more like cyberBOOB
* okay cyberBOOB
* cyberBOOOOOb
* static list
* fix?
* fix
* ID please
* hows that for resolving name collision?
* Fix shit
* fixes cloning
2017-07-14 09:59:48 -04:00
102d1cce25
Refactors screwdriver coloring to use greyscale ( #29199 )
...
* Removes some debug code
* get outta here!
* Replaces random sprites with the old colors
* Sorts out inhands
* Dynamics inhaaaaaands
* stop eavesdropping, world!
* Sprite updates
* Conflicts 1
* Conflicts!
* Conflicts 1
* No conflicts!
2017-07-14 13:53:28 +02:00
afbc92e275
Fixes wallframes ( #29230 )
2017-07-14 13:47:47 +02:00
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
9fe3d5088d
Fix the attackby of the supermatter containment core
...
It was eating your tongs for no apparent reason and also not passing the
tongs into the load proc instead passing in it's own sliver
2017-07-14 02:30:01 +00:00
d3bcb4cbf9
Removes old height parameter from CanPass proc ( #29218 )
2017-07-13 08:57:25 -03:00
7a26305498
Replaces ex_act and emp_act numbers with defines ( #29215 )
...
* defines
* defines
* explode_none
2017-07-13 08:56:26 -03:00
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
77f8b362fc
Adds a 'nemesis faction' system to transforming weapons ( #28826 )
...
* Minor generalizations of the cleaving saw
* Some fixes and refactors
* Update transforming.dm
2017-07-12 17:02:52 -04:00
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
814683b231
Merge pull request #29201 from Xhuis/welding_tool_overlays
...
Welding tools now use overlays for fuel gauges, rather than icons
2017-07-12 14:59:08 -03:00
kevinz000