Commit Graph

18186 Commits

Author SHA1 Message Date
Joan Lung
1a26cf9aa5 Ratvar will now proselytize stuff that happens to be in space (#21340)
* Ratvar will now proselytize stuff that happens to be in space

* do you hear ratvar singing

* no narsie in ooc

* "

* don't need that

* heir

* bigger stronger more filled with brass
2016-11-04 09:06:57 +01:00
oranges
04a6fc47f2 Merge pull request #21319 from ExcessiveUseOfCobblestone/geishaoncemore
GeishAgain!
2016-11-03 10:10:51 +13:00
oranges
8ebf0c0ea3 Merge pull request #21320 from Mervill/master
Late joining won't runtime if the emergency shuttle does not exist (dev QoL)
2016-11-03 10:00:17 +13:00
oranges
dc6c51086f Merge pull request #21312 from JJRcop/chronofixyetagain
Fixes chronosuit not checking if held items are chronosafe
2016-11-03 09:50:08 +13:00
oranges
2feb302b2d Fix duplicate species id's (#21287)
Unique id's for both krokodil humans and infectious zombies
Unique id for the ashwalker lizard subspecies

Uses the correct limbs_id var to ensure their icons reuse the
appropriate icons of correct species
2016-11-02 08:51:02 -04:00
Cheridan
19c6919e88 Merge pull request #21309 from phil235/ClonePodRuntimeFix
Fixes two runtime from clonepod.
2016-11-02 06:05:11 -05:00
Cheridan
1ff1dc1542 Merge pull request #21307 from tgstation/AnturK-patch-1
Fixes a typo.
2016-11-02 03:25:57 -05:00
oranges
e2e0400a91 Merge pull request #21292 from XDTM/WhosThere
Makes ninja stealth make you mostly transparent instead of 100% invisible
2016-11-02 16:20:23 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Cheridan
72e08593f1 Merge pull request #21295 from Iamgoofball/patch-142
You can cauterize with a laser gun now.
2016-11-01 09:12:24 -05:00
Mervill
fbf85c3a1b Merge branch 'shuttlefix' 2016-10-31 21:36:25 -07:00
Mervill
acfd3004a0 Avoid runtimes in late joining, throw warnings at startup if the emergency shuttle does not exist 2016-10-31 21:26:39 -07:00
Joan Lung
ee76078d16 Merge pull request #21060 from phil235/Color_washing
Adding var/list/atom_colours to /atom .
2016-10-31 21:12:29 -04:00
phil235
0876b424a7 Tiny fixes and suggested changes.
Blight ability will still color your hair, and will be cleared when cured.
2016-11-01 01:59:23 +01:00
ExcessiveUseOfCobblestone
67b14be455 no merge conflicts pls 2016-10-31 20:00:27 -04:00
Tacolizard
8a57efc8ab very minor atv crate tweaks (#21244)
the atv crate has been changed from a plain crate to a large one because realism.
the price has been lowered from 3000 to 2000 
the crate includes a leather overcoat and skull bandana so you can make a biker gang
it's been renamed the Biker Gang Kit
2016-11-01 11:35:24 +13:00
oranges
687967a685 Merge pull request #21271 from JJRcop/youarekiddingmerightwheredidmycodebabbygoyoukilledityoumonster
Readds the day the world ended
2016-11-01 11:32:16 +13:00
oranges
6a411a5a97 Merge pull request #21266 from kevinz000/revert1
Reverts Hardlight Bows
2016-11-01 11:31:40 +13:00
duncathan salt
6f909d3748 Merge pull request #21261 from Xhuis/fix_bundle
Fix bundle
2016-10-31 13:58:27 -06:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
AnturK
373cfd8303 Fixes dental implant runtime (#21256)
* Fixes dental implant runtime

* oranges is right
2016-10-31 19:51:54 +01:00
ExcessiveUseOfCobblestone
059a900e3f Removes Stray Space in Species_type in an effort to save the world. (#21286)
* Fixes Zombies / Flags for Species

* GO BACK

* Reverts Defines
2016-10-31 19:45:34 +01:00
JJRcop
8d871d0777 Fixes chronosuit not checking if held items are chronosafe 2016-10-31 13:01:08 -04:00
phil235
e2c5cbb334 Fixes two runtime from clonepod.
Moves countdown effects into the effect folder instead of being in their own module.
2016-10-31 14:34:25 +01:00
AnturK
64a2753ce9 And the other one 2016-10-31 12:52:47 +01:00
AnturK
b6e2d67098 Fixes a typo. 2016-10-31 12:21:15 +01:00
Iamgoofball
2885eab9f3 You can cauterize with a laser gun now.
it's a laser it makes sense
2016-10-30 17:21:39 -07:00
XDTM
66a7fde82d ALMOST invisible 2016-10-31 00:35:49 +01:00
oranges
3aea9c7feb Refactor apc attackby slightly to avoid a colon (#21263)
also adds a runtime for attackby interacting with an APC when it's not
on a turf (which should be impossible)
2016-10-30 22:57:13 +01:00
Kyle Spier-Swenson
3e67d90484 fixes plasma crashing clients/the server 2016-10-30 14:27:45 -07:00
Cheridan
c5ff8b987e Merge pull request #21245 from MrStonedOne/byondinitclean
Cleans up some init procs from world start.
2016-10-30 16:05:29 -05:00
Leo
4f3d65d2be Fixes order by id button in library's computer (#21259)
* Fixes order by id button in library's computer.

* Removes comment that Remie didn't like

* Removes an accidental comment
2016-10-30 18:39:00 +01:00
oranges
ef38656c47 Tweak Duplicate object proc (#21069)
Better typepathing and doesnt try to update_icon on things
that don't have an update_icon proc defined

Also adds a holoitem flag so admin area copy doesn't make objects immune
to lava fire and acid
2016-10-30 13:41:54 +01:00
bgobandit
e7d0db78f1 The creepy clown epidemic has arrived at Space Station 13. (#21164)
* Implements a full spooky clown event for halloween.dm

* temp

* made requested fixes

* reeeee

* Clowns actually work now. Minor refactors to hallucination thanks oranges

* CLOWNS FINALLY WORK PROPERLY JESUS FUCK

* Fix incorrect prob method call
2016-10-30 19:51:19 +13:00
oranges
92ee6b4b43 Merge pull request #21272 from ExcessiveUseOfCobblestone/zombiefix
moves speedmod to infectious zambies only
2016-10-30 18:58:24 +13:00
ExcessiveUseOfCobblestone
2966abffb0 moves speedmod to infectious zambies only 2016-10-30 01:54:53 -04:00
Shadowlight213
3d3fef9998 changes so only humans and lizards 2016-10-29 22:29:45 -07:00
JJRcop
540c3dcdb1 It seems we forgot to celebrate when some thought we'd die in 2015 2016-10-30 01:25:21 -04:00
Shadowlight213
d01b76172d removes species change from Halloween event 2016-10-29 22:05:29 -07:00
kevinz000
7e364fd79a rip 2016-10-29 20:45:23 -07:00
Mysak0CZ
ca58db328d [ready for review] APC minor tweaks (#21241)
I moved some things in APC's construction code.
Emaged and malf-AI-hacked APCs can now be fixed replacing theyir board (old one destroyed in process). - We emag and hack APC's board, not frame
You can now add/remove APC's wires even if board is secured
Removing APC's and SMES's terminal no longer ignore current tool's speed
You can repair APC's cover (only if APC is not compleatly broken) by using APC frame on it, while electronicks are still in place
You can no longer unlock AI-hacked APCs, throught AI still can
    closing APC's cover will lock it
2016-10-30 09:34:51 +13:00
Joan Lung
7262c16328 Merge pull request #21243 from lzimann/selflog
You can see your own attack log once again
2016-10-29 15:50:55 -04:00
Xhuis
398d4099e4 First pass: disposals, glands, tubes, and cocoons 2016-10-29 15:08:11 -04:00
Cheridan
725cee1a05 Merge pull request #21226 from MrStonedOne/patch-261
[s] And the rat races are off!
2016-10-29 00:47:39 -05:00
Cheridan
121271697f Merge pull request #21212 from optimumtact/ionlaws
Improves logging for ion laws
2016-10-29 00:45:32 -05:00
Joan Lung
663ef769f7 Reworks Guvax (#21202)
Guvax is now targeted; invoking it charges your slab to bind and start converting the next target attacked in melee within 10 seconds. This makes your slab visible in-hand.
tweak: Above 5 Servants, the invocation to charge your slab is not whispered, and the conversion time is increased for each Servant above 5.

Using Guvax on an already bound target will stun them. The bound target can resist out, which will prevent conversion.

Sentinel's Compromise is now targeted, like Guvax, but can select any target in vision range.

Sentinel's Compromise now also removes holy water from the target Servant.

Clicking your slab will cancel these scriptures.

Both of these will change your cursor, to make it obvious they're active and you can't do anything else.


Convert times are faster at very high servant amounts, but it's much easier for 1-on-1 conversions to go wrong and have the target escape. (Though the binding makes early conversions slightly easier.)

Resist time for the binding is a flat 4 seconds, and moving/being moved while chanting will break it immediately.
Formula for conversion time is 5 + (0.5 for each valid servant above 5) seconds up to a maximum of 10 seconds at 15 servants.
2016-10-29 18:16:21 +13:00
oranges
6ed7d6681d Merge pull request #21208 from XDTM/WheelchairWizard
Wizards no longer need sandals to cast robed spells
2016-10-29 18:13:52 +13:00
TehZombehz
cbb527fcec Adds Juiceboxes/Cartons + Apple juice & Choc. Milk (#21206)
* Adds Juiceboxes/Cartons

Adds craftable small cartons and juiceboxes.

* Housekeeping

Thanks, goof.

* Acting upon suggestions

Reduce cost of crafting from 2 to 1 sheet of cardboard, reduced volume
of small cartons from 25 to 15. +Housekeeping

* New Sprites + Fixes

Adds distinct grape, orange, and chocolate milk juice box colors (from
Nienhaus). Adds chocolate milk. Changes standard chocolate recipe to
compensate for chocolate milk change (soy milk chocolate bar recipe
remains the same). Fixes being unable to juice grapes in reagent
grinders.
2016-10-29 18:13:32 +13:00
oranges
67b9d2ffdc Merge pull request #21204 from TehZombehz/customsize
Custom food items are now w_class 2, allowing them to fit in papersacks.
Prevents you from putting custom food items into other custom food items. A minor bugfix that existed before that allowed for infinipizzas and infinicakes.
Gone are the days of:
That's a custom cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake. (Feature? You decide.)

It bothered me that a crafted sandwich can fit inside a paper sack, but a custom sandwich that's just two slices of bread put together is suddenly too big. On the other side of this, you can now fit entire custom cakes into paper sacks, which doesn't make a whole lot of sense. If this bothers anybody, it's easily fixed.
2016-10-29 18:12:09 +13:00
oranges
d52cbb5024 Merge pull request #21247 from kevinz000/I-fixed-this-I-swear
At this point if this doesn't fix hardlight bows then bows as a whole are broken.
2016-10-29 18:08:47 +13:00