Commit Graph

4661 Commits

Author SHA1 Message Date
Cheridan
6f1ba9a669 Merge pull request #17008 from ChangelingRain/shivertile
Floor tiles have slightly random placement
2016-04-20 22:42:11 -05:00
Cheridan
fb02af044a Merge pull request #16995 from ChangelingRain/thisiswhathappenswhenyoumergewithoutanyonecheckingmyworkkor
Fixes cyborg screwdriver and wirecutters having no icon
2016-04-20 18:03:30 -05:00
Cheridan
ec001cf1d9 Merge pull request #16952 from Core0verload/meme-out
i was the antiskub all along
2016-04-20 17:56:59 -05:00
Cheridan
c53887e4c1 Merge pull request #16987 from ChangelingRain/overlay
Makes a few things use temporary overlays
2016-04-20 12:11:58 -05:00
Nerd Lord
30c5fc412c Floor tiles have slightly random placement 2016-04-19 23:28:49 -04:00
Nerd Lord
fb274886f9 regardless of what you do this is disgusting 2016-04-19 15:44:30 -04:00
Nerd Lord
fd243de33d kor's fault 2016-04-19 15:40:02 -04:00
duncathan salt
b85e10f00a Merge pull request #16929 from kevinz000/safegriefing
Admin Detection Multitool
2016-04-19 08:52:36 -06:00
Nerd Lord
ff44a04f3b Makes a few things use the temporary overlays instead of doing stuff manually 2016-04-19 10:28:40 -04:00
c0
c9926867d1 Final Solution for one shitty meme 2016-04-19 11:02:56 +03:00
kevinz000
e446c5b411 Definesarenice 2016-04-18 23:40:30 -07:00
Jack Edge
a5600abd26 Use drone dufflebag sprites 2016-04-19 00:03:24 +01:00
Nerd Lord
c06c81a3a6 fuck sprite conflicts 2016-04-18 16:30:07 -04:00
Nerd Lord
bab446dcd2 New tool inhand sprites 2016-04-18 16:15:23 -04:00
Cheridan
d671bf573c Merge pull request #16858 from nullbear/Chemical-Explosives
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
Cheridan
e7f7704099 Merge pull request #16921 from RandomMarine/theclothening
Biogenerated cloth stacks.
2016-04-18 02:27:36 -05:00
Cheridan
842d50cef2 Merge pull request #16831 from zenek123/master
Makes vodka able to clean floors
2016-04-18 02:06:54 -05:00
kevinz000
6bd271b299 Itried 2016-04-17 20:26:55 -07:00
Joan Lung
a88f498701 Merge pull request #16918 from coiax/drone-duffles
Drones start with preloaded engineering dufflebags
2016-04-17 15:49:57 -04:00
coiax
884d85e519 Adjusted dufflebag contents 2016-04-17 20:21:23 +01:00
kevinz000
815807ae20 Lessens search range as it doesn't need to look in the entire world 2016-04-17 01:10:37 -07:00
Joan Lung
6c16bc874a Merge pull request #16843 from PKPenguin321/krow-macaw
Adds Krav Maga
2016-04-17 00:02:48 -04:00
PKPenguin321
ac3e7e18dd final style changes 2016-04-16 20:30:18 -07:00
kevinz000
715d4b22b9 Revert "Revert "Admin Detection Multitool""
This reverts commit 7dc3e70f1e.
2016-04-16 20:08:36 -07:00
kevinz000
7dc3e70f1e Revert "Admin Detection Multitool"
This reverts commit 2e49750322.
2016-04-16 20:07:59 -07:00
kevinz000
2e49750322 Admin Detection Multitool
Allows for griefing to be done in safety :^)
2016-04-16 20:07:42 -07:00
RandomMarine
76212a5fb9 Implements cloth stacks 2016-04-16 12:56:37 -07:00
RandomMarine
82e39d6a85 Implements cloth stacks 2016-04-16 11:11:16 -07:00
Jack Edge
db5f08adf0 Fixed indentation issues 2016-04-16 18:29:44 +01:00
Jack Edge
683aa9b26f Drones start with preloaded engineering dufflebags
🆑 coiax
rscadd: Drones now start with a spacious dufflebag full of tools, so they will stop stealing the captain's
/🆑
2016-04-16 18:09:28 +01:00
Incoming
22c9a1e14d Removes the blatantly copyrighted sans and papyrus action figures and the blatantly copyrighted sounds attached to them.
As a bonus this also makes the project work in the stable 509 build again.

@ChangelingRain NO.
2016-04-16 00:19:35 -04:00
Joan Lung
262c0688de Merge pull request #16845 from Shadowlight213/Bluemag
Adds bluespace emag as a badmin item
2016-04-15 20:26:02 -04:00
PKPenguin321
2ecb556e94 addresses minor feedback, fixes implant
krav maga implant now works 100%
trailing returns and a useless if() removed
2016-04-14 22:49:29 -07:00
PKPenguin321
ea3fea4d63 fixes dna injector bug 2016-04-14 12:45:05 -07:00
Cheridan
2f52e7daf9 Merge pull request #16829 from erwgd/LetUsMakeDinnerware
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
Cheridan
95b41dfaee Merge pull request #16851 from coiax/helpimonfire
Using fire extinguisher in help intent is helpful
2016-04-14 11:47:17 -05:00
coiax
7f328ba077 Added ORIGINAL CONTENT skeleton toys that chatter when you play with them (#16792)
* Step one, aquire voices for skeletons

* Moved sounds to their own folder

* Added samples of up to ten phomemes long for papyrus

* Added samples of up to ten sans phomemes

* Add skeleton talking

Skeletons now produce audible sound effects representing their distinctive
speech.

* Skeletons now respect punctuation in their chatter

Except for semi-colons, due to HTML escapes of the ' character.

* Lowered volume of skeleton phomemes

* Use Dunc's regex for parsing messages

* Added sans and papyrus toy sprites

Spriting is hard. But I think I managed to crush the images down to fit
in our 32x32 box.

* Generic talking action figures

Talking action figures like the owl figure and the griffin figure are
now generic, and have a pool of messages to pick from. This allows us to
make our TOTALLY ORIGINAL skeleton toys.

* Added the toys to the prize list

No point making these if you can't get them.

* Moved skeleton vocalising code into toys

* Fixes runtimes and bugs with skeleton talk

Remaking the regex each time makes sure it gives output everytime,
and we've also put a check that the item in the list is actually
a number before calling max() that was causing a runtime previously.

* Restored original form of skeleton span picking

Remie's was better.

* More messages for skeleton toys

I think that's probably enough to satisfy me.

* Changed for loop to new style
2016-04-14 09:30:33 -04:00
Joan Lung
d8a724f1c4 Merge pull request #16806 from coiax/airlock-painter
Airlock painter now printable in autolathe; plus meme suicides
2016-04-14 09:29:10 -04:00
Joan Lung
b19a638af3 Merge pull request #16805 from KorPhaeron/gravity
Fixes gravity in new areas
2016-04-14 09:21:43 -04:00
Jack Edge
54675eb415 Only call get lungs once 2016-04-14 08:27:59 +01:00
Cheridan
7eb6ed727e Merge pull request #16838 from Shadowlight213/implantlogging
Explosive implant logging and general improvements.
2016-04-13 18:11:30 -05:00
Jack Edge
6aa77cc95d Removed unneeded seperation 2016-04-13 22:13:02 +01:00
Jack Edge
51b41fc124 Use correct variable names and correct proc calls 2016-04-13 22:09:26 +01:00
nullbear
df32979866 Adds Chemical Explosives
see changelog for details
2016-04-13 13:09:41 -07:00
Jack Edge
64f5f1a08e Removed check preventing self target extinguisher
The comment on this code segment implies it's to stop the fire
extinguisher from going off when put in a bag. Except it doesn't go
off when put in a bag, even without this code check.

As such, it was stopping self targeting with a fire extinguisher.

Make sure the safety is off though!
2016-04-13 18:17:00 +01:00
AnturK
4b7f274e3f Merge pull request #16742 from Core0verload/master
Cargo Exports (and a very basic economy system)
2016-04-13 17:41:05 +02:00
Jack Edge
cafd76c7f2 Handled case where someone lost their lungs
We won't remove your lungs if you don't have any. But how did you
manage to lose them in this tiny window, you horrible person?
2016-04-13 11:33:25 +01:00
Jack Edge
01a3d0e761 Added help to extinguisher/attack but bugged
It's not triggering the afterattack proc to spray the water...
2016-04-13 11:25:11 +01:00
Shadowlight213
5ebf9be9ab Grammar 2016-04-12 21:02:49 -07:00
KorPhaeron
05cdcabb48 Gravity Fix 2016-04-12 22:13:23 -05:00