Commit Graph

12199 Commits

Author SHA1 Message Date
Fox McCloud
9c7682a5ea Merge pull request #3684 from Crazylemon64/goodbye_update_icon_var
Completely tears out all uses of the 'update_icon' var in mobs
2016-02-24 01:52:42 -05:00
Crazylemon
da01814113 Completely tears out all uses of the 'update_icon' var in mobs 2016-02-23 21:55:03 -08:00
Tastyfish
41cee29623 Fixes jukebox actually using preferences (Volume and Head Streaming) 2016-02-24 00:22:37 -05:00
TheDZD
e5dc058e21 Merge pull request #3658 from Regen1/firelasers
Adds immolator laser gun
2016-02-22 18:23:45 -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
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
Regen
f4ba151d33 oops
it's plasmatech, not plasma
2016-02-21 14:22:25 +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
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
TheDZD
84f01d99b9 Merge pull request #3627 from VampyrBytes/adminreagents
fixes #3615
2016-02-19 22:47:00 -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
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
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
Fox McCloud
fe78b45b41 Merge pull request #3578 from Tastyfish/pda-apps
Complete refactor & partial redesign of the PDA
2016-02-18 13:39:37 -05:00
Fox McCloud
dae905d110 Merge pull request #3614 from Crazylemon64/borer_death_fix
Borer enhancements
2016-02-18 13:39:14 -05:00
Fox McCloud
a290fd7df7 Merge pull request #3612 from Crazylemon64/accessory_attach
Lets you put accessories on other people by attacking them with it
2016-02-18 13:38:40 -05:00
Fox McCloud
0d19e0e8d5 Merge pull request #3622 from Tastyfish/engivend
EngiVend has camera assemblies & be used by borgs
2016-02-18 13:38:13 -05:00
Fox McCloud
5f0736e2ed Merge pull request #3624 from Tastyfish/i-have-no-mouth-and-i-must-fork
Stops utensils from working on mouthless humanoids.
2016-02-18 13:36:55 -05:00
VampyrBytes
e25d9320bd admin_only not adminOnly 2016-02-18 07:53:38 +00:00
Tastyfish
50d0d0c5e0 Paid vending machines usable by borgs too 2016-02-17 18:07:23 -05:00
TheDZD
cbafa08ba0 Merge pull request #3601 from FalseIncarnate/arcade
Arcade Prize Counter
2016-02-17 16:57:49 -05:00
VampyrBytes
bcfb77359f reagent not regent 2016-02-17 19:07:56 +00:00
VampyrBytes
adf52304ee fixes #3615
Reagents now have an admin only marker.
adminReagentCheck takes a list of paths and removes anything containing
admin only reagents
removed possibility of random drinks containing adminordrazine
2016-02-17 12:30:07 +00:00
Tastyfish
e27fb5d27f Stops utensils from working on mouthless humanoids 2016-02-16 22:52:56 -05:00
KasparoVy
b42e4d7da9 Mask Adjustment Bugfixes 2016-02-16 22:47:19 -05:00
FalseIncarnate
951fb00626 unEquip, typeless list, and upgraded subtype 2016-02-16 22:43:45 -05:00
TheDZD
26f80c2cd3 Merge pull request #3610 from Spacemanspark/more-robot-emotes-because-why-not
Adds *yes and *no emotes to IPCs and other synthetics.
2016-02-16 17:28:16 -05:00