Commit Graph

6340 Commits

Author SHA1 Message Date
Leo
aa0844a578 Merge pull request #30112 from YPOQ/toysoundfix
Fixes sounds for toy nuke, red button, and talking action figures
2017-08-24 08:57:02 -03:00
kevinz000
169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
MoreRobustThanYou
0a530cff9c Refactors forensics to a datum (#29542)
* ports plasmeme windows from /vg/

* Update window.dm

* It's the stairway to seinfield

* fixity fix fix

* See this code if you're wondering why I rarely get any sleep

* *scream

* now

* this is going to give me PTCSD - post-traumatic coding stress disorder

* *scream

* Improves forensics datum

* Meep.

* RA RA RASPTUIN... i'm not crazy, right?

* better

* I think it works... /s

* less compile errors

* Reduces compile errors to a much more managable 50

* shitcode.exe

* ehhh

* HEY EVERYONE, IT WORKS!!

* Make slide code less autistic

* blue skyyy

* no more bay forensics!

* IT  WORKS

* Remove EnforceSize, it isn't used.

* icon2html

* More bicon sutff

* eee

* aeee

* abc

* abc

* a

* abc

* e

* forensics check in initalize

* huh

* bleh

* Update _drone.dm

* Update _drone.dm

* Update _drone.dm
2017-08-24 09:08:22 +12:00
Jordan Brown
41eed1ce22 Merge pull request #30079 2017-08-23 12:04:50 -04:00
Jordan Brown
ded46bcd6f Merge pull request #30075 2017-08-23 12:04:43 -04:00
YPO
6bad54226b fixed sounds for nuke, redbutton, and talking action figure 2017-08-22 20:15:04 -06:00
Ergovisavi
9fb70f22d8 ATMOS Resin removes iciness from floors (#29967)
* atmos resin now makes the floor non-slippery, increased the turf coverage of resin by one unit

* Atmos resin removes wetness on floor tiles upon generation
2017-08-22 14:30:23 +12:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Lzimann
bd47a3a345 Fixes heater/freezer boards not working properly 2017-08-21 12:32:20 -03:00
Cyberboss
1b2a38c043 Merge pull request #30004 2017-08-19 19:40:27 -04:00
Cyberboss
b7beae9da8 Merge pull request #30010 2017-08-19 19:40:26 -04:00
Ashe Higgs
dfd642f861 Ports smart metal foam from FTL (#29963)
* Ports smart foam from FTL

* Adds foam grenades to the EngiVend

* Why are you doing htis?

* Stuff

* badoop
2017-08-18 23:05:37 -04:00
MoreRobustThanYou
4f3657a05b Makes RCL icons better at updating
and also fixes buggy ghetto RCL sprites
2017-08-18 14:11:50 -04:00
Jordan Brown
a4f3df42ff The TSA has reason to believe there are weapons in the airport 2017-08-18 01:09:07 -04:00
Jordan Brown
728aefbd70 Adds DropLocation(). To generally be preferred to get_turf() (#29814)
Fixes #29802

Unlike get_turf()this will sensibly pick if loc can be safely used
2017-08-18 16:44:20 +12:00
shizcalev
75dc5d8272 Moved emagged var to item parent. 2017-08-17 22:15:11 -04:00
MoreRobustThanYou
093cb1a184 Adds RCL inhands (#29964)
* Adds RCL inhands

* Okkk

* MERGE CONFLICKTS 4EVER

* ree
2017-08-17 19:21:06 -03:00
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
Jordan Brown
47e1cfb179 Merge pull request #29934 2017-08-17 10:12:51 -04:00
AnturK
94a5f4570a Fixes dumping from inside the lockers (#29896) 2017-08-17 18:57:30 +12:00
oranges
b11b33bdac Merge pull request #29954 from Cyberboss/RemoveItemCrafting
Fixes weaponcrafting repath
2017-08-17 10:46:34 +12:00
Ian Turk
d50b0c6e63 resolved conflicts 2017-08-16 13:11:21 -06:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
ShizCalev
24811251a7 Fixed mop inhand, adds new inhand for the advanced mop (#29910)
* inhands

* adds inhand, fixes other inhands
2017-08-16 14:08:18 -04:00
Jordan Brown
fab63821f5 Fixes weaponcrafting repath 2017-08-16 12:15:08 -04:00
ShizCalev
bfe27a5f98 Merge branch 'master' into crafting-fixes 2017-08-16 11:19:30 -04:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk
371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
shizcalev
9a6d79f73b Fixes leathercrafting 2017-08-15 16:36:37 -04:00
Leo
5fafb4befe Merge pull request #29889 from Cyberboss/MouseOpacityDefines
Adds defines for mouse_opacity
2017-08-15 13:01:28 -03:00
Jordan Brown
d144c88fb5 Annihilates the colons! (#29812) 2017-08-15 12:49:35 -03:00
Jordan Brown
f0f456e8c3 Merge pull request #29854 2017-08-14 17:00:16 -04:00
Jordan Brown
87ea31f5b5 Merge pull request #29871 2017-08-14 17:00:10 -04:00
shizcalev
2a5df54e7c moved can_trigger_gun to weapon parent 2017-08-14 13:30:20 -04:00
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Kyle Spier-Swenson
f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
Cyberboss
80bd5e3a7f Merge pull request #29840 2017-08-13 02:16:27 -04:00
Xhuis
210f03723e Fixes Syndicate cyborg esword icons 2017-08-13 00:48:33 -04:00
MoreRobustThanYou
1ee360f228 His Grace now shows up on the orbit list (#29819)
* His Grace now shows up on the orbit list

* .

* Update his_grace.dm
2017-08-11 17:08:38 -03:00
ShizCalev
2d133d3668 Fixed inhand for cable cuffs (#29811) 2017-08-11 09:51:46 +02:00
FrozenGuy5
026d4ed8da initialize() (#29807) 2017-08-11 09:50:00 +02:00
Jordan Brown
e71ae59245 Ports weaponry to Initialize (#29804) 2017-08-11 09:49:30 +02:00
kingofkosmos
10c5366f4a Compacted the used-check. Corrected whetstone-warning-spans. 2017-08-10 23:03:12 +03:00
kingofkosmos
ac218908cd Adds icon_states to the unused and used Eldritch whetstones. 2017-08-10 22:48:40 +03:00
FrozenGuy5
4b4cd5e416 decapitalizes flyswatter in weaponry.dm (#29805)
* spelling

* initalize supermatter sword

* is this how you revert a commit hurrdurr
2017-08-10 08:08:56 -05:00
Jordan Brown
df94d4b189 Merge pull request #29747 from lzimann/machinerycopypasta
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 15:14:16 -04:00
Lzimann
b967520144 Fixes dme issues. Also renamed _circuitboard.dm to circuitboard.dm 2017-08-09 13:44:23 -03:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
Jordan Brown
3c56d0f4f3 Ports duplicated slipping code to a component (#29628)
* Ports duplicated slipping code to a component

* Makes metal not slippery

* asdf

* Instead of cherry picking like an idiot I could just copy paster

* OOP

* And blood, don't forget Fry's blood!

* Further fixes

* A more generic fashion

* Use the new system

* Fixes

* Fix cartridge type

* Remove inertia
2017-08-09 16:06:15 +02:00