Commit Graph

13438 Commits

Author SHA1 Message Date
Mieszko Jędrzejczak 2de6d5fbdd Name to synthanol, again. 2016-02-23 00:02:21 +01:00
Mieszko Jędrzejczak 10202ac78d Made it child of ethanol
Synthanol is now a child of ethanol. Cheers!
2016-02-22 23:19:00 +01:00
Mieszko Jędrzejczak 3aa923b7da Fixed spans when drinking/feeding 2016-02-22 16:29:55 +01:00
Aurorablade 7b5c5c2a13 shade on shade off 2016-02-22 06:03:11 -05:00
Tastyfish 492ed2f16e Corrects CentComm spelling 2016-02-22 04:39:10 -05:00
Tastyfish 63048c7492 Fixes some spelling grammar errors 2016-02-22 04:11:04 -05:00
Tastyfish 9b80f20ba7 Adds frame tilting and nade triggering 2016-02-22 02:32:38 -05:00
Aurorablade d861d86edd halp
open handed cavity item removal not working, help_shake_act seems to be
taking priotity, debrained sprite not appearing right on brain removal
2016-02-21 23:55:47 -05:00
Tastyfish cb4439de44 Forgot glass frame materials 2016-02-21 21:07:20 -05:00
Tastyfish 4f3ce4ecbc Adds picture frames 2016-02-21 21:00:45 -05:00
Fox McCloud 29784c9875 Merge pull request #3650 from TheBeoni/Sandals
Adds new sandals.
2016-02-21 19:26:42 -05:00
Regen 097914386f Adds item state
Also removed extra whitespace
2016-02-21 23:02:56 +01:00
Mieszko Jędrzejczak 90d90f3571 Added files via upload 2016-02-21 18:48:54 +01:00
Regen f4ba151d33 oops
it's plasmatech, not plasma
2016-02-21 14:22:25 +01:00
Mieszko Jędrzejczak a95ea95893 Update drinks.dm 2016-02-21 14:19:24 +01:00
Regen 8a6bedd028 Fixes
Fixes typo in the gun sprite, adds origin_tech and tweaks charge cost
2016-02-21 14:19:18 +01:00
Mieszko Jędrzejczak 23d33051fb Beep Boop IPC booze 2016-02-21 13:19:18 +01:00
Aurorablade 2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
Regen 2db5fec54a Adds immolator laser gun
Adds an immolator laser gun, which has 7 shots and ignites the target.
http://puu.sh/nfys1/b381d812de.png

Will add more and better pictures tomorrow, but right now I need sleeps
2016-02-21 03:26:44 +01:00
Fox McCloud f56914781d Merge pull request #3651 from Tastyfish/better-name-edit
Refactors renaming so it works consistently
2016-02-20 17:51:43 -05:00
Fox McCloud 941d992920 Merge pull request #3655 from VampyrBytes/washrefactor
refactors washing items
2016-02-20 17:41:53 -05:00
Fox McCloud 7223fe4546 Merge pull request #3645 from Crazylemon64/mining_drone_sand_collection
Various Mining Enhancements
2016-02-20 17:26:15 -05:00
Fox McCloud 6a25847277 Merge pull request #3643 from Crazylemon64/gotta_go_slow
No more superspeed simple mob attacking
2016-02-20 15:30:59 -05:00
VampyrBytes 386ed87126 refactors washing items
fixes #3570
Could have fixed with another if statement in sink/attackby, but it was
already pretty snowflakey, and had the potential to get worse
Items now have a wash proc that the sink calls, that can be overridden
when needed
2016-02-20 12:01:40 +00:00
TheBeoni bf7fcec275 Corrected. 2016-02-20 12:33:57 +01:00
Fox McCloud e124b53593 Merge pull request #3640 from VampyrBytes/Gateway
Prevents return when exiled and inside something
2016-02-20 02:24:06 -05:00
Fox McCloud 716edf2533 Merge pull request #3634 from KasparoVy/packbackets
Vox-fitted Back Stuff, Adds Genetic Duffel, Fixing Typos and Refactoring Back-Icon Generation
2016-02-20 02:20:16 -05:00
Fox McCloud 2bbd877563 Merge pull request #3609 from KasparoVy/BomberJackets
Adds Opening/Closing of Bomber Jackets and Security Bomber Jacket + Refactors Jacket Adjustment + Grammar Fixes
2016-02-20 02:19:27 -05:00
Aurorablade 1b4fe03ef7 ....NOTHING TO SEE HERE 2016-02-19 23:10:59 -05:00
TheDZD 84f01d99b9 Merge pull request #3627 from VampyrBytes/adminreagents
fixes #3615
2016-02-19 22:47:00 -05:00
Aurorablade 07381e800d just a jump to the left... 2016-02-19 21:49:47 -05:00
Tastyfish 848799c603 Removed long and out of date/pointless comments 2016-02-19 21:26:19 -05:00
Tastyfish 85cfccf2d9 Refactors renaming so it works consistently 2016-02-19 21:03:33 -05:00
TheBeoni ce0f5a962a Adds new types of sandals. 2016-02-20 02:56:26 +01:00
Crazylemon64 bc2e01349f Drilling the ground makes noise, and the fuel generators work off ore too now
You can also load your generators straight from the ore box, but this will be highly inefficient, as the ore reclaimer will be able to multiply the materials
present by a large factor
2016-02-19 17:51:15 -08:00
Crazylemon 7c3c27dde2 RIPLEY should now be able to actually drill for sand 2016-02-19 14:25:23 -08:00
Crazylemon64 93f5d97eed Mining drones will now collect sand 2016-02-19 10:57:57 -08:00
KasparoVy 5c5bf92d87 Adds opening/closing of bomber jackets, adds Security bomber jacket. IAA jacket is closed by default now. Replaces bomber jacket with Security bomber jacket on the Pod Pilot's table. Refactors jacket adjustment. Grammar fixes. 2016-02-19 12:05:31 -05:00
Aurorablade 7d612b0e40 jobs done
more werk?
2016-02-19 09:24:04 -05:00
VampyrBytes d4d16ac98b fixes /blacks 2016-02-19 13:47:47 +00:00
Crazylemon64 7f47aea249 No more superspeed simple mob attacking 2016-02-19 04:55:11 -08:00
VampyrBytes 4272fb8729 takes unneeded iftype check out of for loop
also adds catch in case datum paths get sent through
2016-02-19 11:03:24 +00:00
VampyrBytes 7bfe2a1040 strips testing variable 2016-02-19 10:41:15 +00:00
Tastyfish 29ab940be5 Fixed away mission lighting 2016-02-19 05:22:40 -05:00
VampyrBytes ae1169d13a Prevents return when exiled and inside something
Fixes #3529
If an object going through the awaygate contains a player with an exile
implant in, travel is prevented
2016-02-19 10:17:29 +00:00
Crazylemon64 8a7a17b8e6 Adds matrix and path editing to the variable viewer 2016-02-19 01:20:01 -08:00
Aurorablade 570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Aurorablade 3c952cc191 MERGE CONFLICT TIME
FOOOOOOOOOOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
2016-02-18 18:42:26 -05:00
KasparoVy 679218b952 Vox-Fitted Back Stuff, Adds Geneticist Duffel, Fixing Typos and Refactoring Back Icon Generation
Using species_fit and sprite_sheets now works properly for items worn on
the back. Previously it was using the item_state name if it existed in
order to generate the on-mob icon, which was wrong. I restructured it to
work the same way as the rest of the icon generation procs.
2016-02-18 14:59:28 -05:00
Fox McCloud 9cc5d7cb87 Merge pull request #3599 from KasparoVy/Balaclava-Fix
Mask Adjustment Bugfixes
2016-02-18 13:40:04 -05:00