Ashe Higgs
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
Jordan Brown
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
ShizCalev
45d3d52af7
Made some object lists less terrible to read ( #29304 )
...
* spaces
* more spaces
* last ones
2017-07-18 10:44:29 -04:00
Leo
fea979b46a
Merge pull request #29303 from kevinz000/patch-255
...
Fixes flashbang stun times
2017-07-17 22:13:46 -03:00
Xhuis
30e5070792
Fixes electric guitars
2017-07-17 13:09:50 -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
Jordan Brown
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
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
kevinz000
ce1568190b
Update flashbang.dm
2017-07-16 06:01:44 -07: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
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
Leo
b2665e56da
Merge pull request #29250 from optimumtact/bananabobananafobanana
...
Fix the attackby of the supermatter containment core
2017-07-15 00:45:23 -03: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
Joan Lung
6b1bc117e2
as done
2017-07-14 15:40:24 -04:00
Joan Lung
2551794b5d
RPDs can now place pipes on walls
2017-07-14 15:25:12 -04:00
kevinz000
e461c3add5
Makes showers clean WASHABLE_COLOUR_PRIORITY ( #29170 )
...
Makes showers clean WASHABLE_COLOUR_PRIORITY
2017-07-14 11:39:20 -04:00
Tacolizard
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
Ashe Higgs
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
Joan Lung
afbc92e275
Fixes wallframes ( #29230 )
2017-07-14 13:47:47 +02: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
oranges
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
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
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
Ashe Higgs
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
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
Leo
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
shizcalev
62b32d3f7a
reverted organ refactor #28913
...
reverts #28913
2017-07-11 22:08:57 -04: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
Xhuis
0afa80d23a
Welding tool icons now use overlays
2017-07-11 12:56:39 -04:00
kevinz000
aa04c8c76c
Update musician.dm
2017-07-11 06:28:22 -07:00
kevinz000
6539fa2cb5
Refactors flightsuit code to hopefully be less dumb ( #28033 )
...
Refactors flightsuit code to be less crappy
2017-07-11 11:23:02 +12: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
Tacolizard
127003957b
Organ Update: Refactors chemical and nutrient metabolization onto two new organs, the liver and the stomach. ( #28913 )
...
* 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
2017-07-10 17:21:27 -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
Jordan Brown
afc5640fd6
Merge pull request #29145 from kevinz000/patch-244
...
Updates vending refill packs to reflect additional items added in headphones PR
2017-07-09 20:45:08 -04:00
Jordan Brown
d4e5cfd5a3
Merge pull request #29140 from ChangelingRain/integrity
...
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -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
Jordan Brown
1e173f96c6
Fixes wrapping objects ( #29125 )
2017-07-09 11:13:15 -04:00
kevinz000
248cf95273
Update flashbang.dm ( #29136 )
2017-07-09 08:43:43 -03:00
Joan Lung
db503ace11
boss
2017-07-08 18:29:59 -04:00