Commit Graph

6249 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Xhuis
0afa80d23a Welding tool icons now use overlays 2017-07-11 12:56:39 -04: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
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -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
kevinz000
5e80b018eb Update vending_items.dm 2017-07-08 13:57:10 -07: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
Tacolizard
5868aedcab initial (#29075) 2017-07-06 22:10:01 -03:00
Shadowlight213
68102aaa0c Refactors speech/communication logging and adds coordinates to speech logs (#28997)
* Adds locations to speech and related communications
Refactors how logging is handled for these.

* changes

* ahhhhh

* preemptive merge conflict undoing maybe?

* Let's not delay this further
2017-07-06 16:06:43 -04:00
pigeons
ba5372207f Fixes cartridges not linking with their host PDAs on creation (#28989)
* Reverts Initialize memes

* loc

* KISS
2017-07-06 10:06:14 -04:00
Jordan Brown
a2d25af44b Merge pull request #29006 from Xhuis/twohand_storage_fix
Fixes forced two-handed weapons being unstorable
2017-07-05 20:52:03 -04:00
kevinz000
9d06913ac1 Gives AI radios loudmode (#29023) 2017-07-04 22:49:51 -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
PKPenguin321
2d599e1b97 Adds the circle game (#28961)
* adds the circle game
- adds an inventory sprite to weapons.dmi
- adds the code for the hand "object" to weaponry.dm
- adds emote datum code for making your hand a circle to emote.dm

* fixes
- makes sure the emote is actually ran before creating objects
- qdels the new object if it fails to get placed into the mobs hand

* adds a message to the user when emote fails

* added special examine reactions
- added new proc to items.dm
- added handling for the proc in human/examine.dm
- added special examine reaction to the circled hand in weaponry.dm
- removed a check on the circle emote that made it not work in emote.dm

* defines, a fix

* undoes last two commits
2017-07-04 22:25:51 -04:00
Jordan Brown
d6b66911b1 Merge pull request #29020 from ohnopigeons/autocharterfixpr
[s] Fixes for charter autoaccept
2017-07-04 21:49:36 -04:00