Commit Graph

20204 Commits

Author SHA1 Message Date
Fox-McCloud
20107e1147 tweak 2016-02-22 22:20:27 -05:00
Fox-McCloud
49cd05ff3c colored light removal 2016-02-18 01:37:52 -05:00
Fox-McCloud
5522786318 Makes Fires Much Cheaper 2016-02-18 00:18:28 -05:00
TheDZD
cbafa08ba0 Merge pull request #3601 from FalseIncarnate/arcade
Arcade Prize Counter
2016-02-17 16:57:49 -05:00
FalseIncarnate
951fb00626 unEquip, typeless list, and upgraded subtype 2016-02-16 22:43:45 -05:00
TheDZD
272f818759 Merge pull request #3600 from Fox-McCloud/laser-eyes
Tweaks Laser Eyes
2016-02-16 17:31:10 -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
TheDZD
8fabfb3654 Merge pull request #3608 from Fox-McCloud/emp-change
EMP Kit Tweak
2016-02-16 13:42:01 -05:00
FalseIncarnate
03ecddfc43 Revert "Temporary Prize Counter mapping"
This reverts commit 441a7345d6.
2016-02-16 03:50:42 -05:00
FalseIncarnate
441a7345d6 Temporary Prize Counter mapping
Temporarily adds a prize counter to the bar on Cyberiad and Fitness Room
(dorms) on Metastation
- The metastation one might stay, but the Cyberiad one will very likely
get moved in the near future.

Adds a fully upgraded prize counter to the ninja's holding pen on
Cyberiad's z2

(map-merged)
2016-02-16 03:39:55 -05:00
Fox McCloud
3a1deec3e6 Merge pull request #3602 from VampyrBytes/BorgDamage
prevents toxloss and oxyloss for silicons
2016-02-15 16:32:48 -05:00
Spacemanspark
4452c24999 Adds *yes and *no emotes to IPCs and other synthetics.
Port of https://github.com/PolarisSS13/Polaris/pull/809
2016-02-15 12:02:03 -06:00
FalseIncarnate
aaeccfdff5 Removes the force from tickets
Tickets no longer deal damage when used as a weapon or thrown.
2016-02-15 02:36:18 -05:00
FalseIncarnate
f44602ab79 Src, Spans, and Chainsaws
Cleans up some src and src.loc in the toys, arcade, and prize counter
files

Replaces some text macros with proper spans

Removes the attack proc from the toy chainsaw, preventing them from
making sounds on hit.
- Still makes the revving sound when you wield them
2016-02-15 02:32:29 -05:00
Fox-McCloud
9d7904e29f EMP Kit Tweak 2016-02-15 01:57:16 -05:00
VampyrBytes
f7511ae017 oxyloss change set to only borgs 2016-02-14 10:16:45 +00:00
Fox McCloud
9f17e44466 Merge pull request #3603 from FalseIncarnate/kitchen
Fixes Plump Helmet Biscuits being uncookable
2016-02-14 04:09:16 -05:00
FalseIncarnate
5376e73252 Fixes Plump Helmet Biscuits being uncookable
The recipe for the plump helmet biscuit was mistakenly removed a while
back (#535), this returns the recipe to the code

Oven Recipe: 5u water, 5u flour, 1 plump helmet cap mushroom.

🆑
fix: Fixes accidental removal of plump helmet biscuit recipe.
/🆑
2016-02-14 02:55:19 -05:00
VampyrBytes
02f3db4183 prevents toxloss and oxyloss for silicons
fixes #3595
stops adjustToxLoss working on silicons, and only allows adjustOxyLoss
when suiciding

Have checked through, nowhere that shouldn't be is directly setting
toxloss and oxyloss, and the only place that uses the setters to set it
to anything other than 0 (statues) doesn't affect silicon based life, so
this will fix the found bug and any other situations is could happen in
2016-02-14 07:44:42 +00:00
FalseIncarnate
0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
Fox-McCloud
7b1905477d Tweaks Laser Eyes 2016-02-14 00:22:13 -05:00
TheDZD
af648474cf Merge pull request #3583 from Fox-McCloud/permit-refactor
Refactors Bot Weapon Identification
2016-02-13 18:23:12 -05:00
Fox McCloud
284c4fe9ae Merge pull request #3582 from Crazylemon64/dont_use_this_floor
Makes it painfully obvious not to use plain old /turf/simulated/floor
2016-02-13 13:40:30 -05:00
VampyrBytes
2f9918b4b6 Fixes walking on water
fixes #3589

missed a 0 in the arguments
2016-02-13 08:41:57 +00:00
Fox McCloud
771babcd0a Merge pull request #3576 from FalseIncarnate/kitchen
Adds Chimichangas
2016-02-13 01:15:00 -05:00
Tastyfish
8d51fc8f1e Fixed handcuff hud overlay 2016-02-13 00:39:04 -05:00
Fox McCloud
ad50607ef7 Merge pull request #3575 from TheDZD/bullshittium-thrusters
Spacepod Tweaks
2016-02-12 23:18:11 -05:00
Crazylemon64
b71905dbb1 Updates the admin's buildmode to use "plasteel" floor 2016-02-12 18:43:57 -08:00
Fox McCloud
c028b4e8b5 Merge pull request #3547 from KasparoVy/Colouring-Bandanas
Adds Orange + Purple Bandanas and Bandana Colouring, Taj/Una Bandana Sprite Tweaks + Mask Adjustment Refactor
2016-02-12 18:34:30 -05:00
TheDZD
02d163a03f Merge pull request #3579 from Fox-McCloud/cheaper-area
Faster get_area
2016-02-12 18:26:15 -05:00
Fox McCloud
ce47eefcf2 Merge pull request #3545 from VampyrBytes/BreakSlipLock
walking prevents sliplock
2016-02-12 18:19:50 -05:00
TheDZD
65a788d51f Merge pull request #3569 from Fox-McCloud/unarmed-golems-martial
Unarmed Attack+Martial Arts Update+Golem Refactor
2016-02-12 18:17:32 -05:00
Fox McCloud
bd527a5745 Merge pull request #3571 from tigercat2000/ircmods
send2irc Multi-Host upgrade
2016-02-12 18:07:41 -05:00
TheDZD
3963dae6ae Merge pull request #3584 from Fox-McCloud/nuke-exploit
[s]Fixes Nuclear Exploit
2016-02-12 17:40:08 -05:00
Fox-McCloud
71c5a99482 [s]Fixes Nuclear Exploit 2016-02-12 17:34:37 -05:00
Fox-McCloud
f47131fbb2 Refactors Bot Weapon Identification 2016-02-12 14:52:50 -05:00
Fox McCloud
aa7b36487b Merge pull request #3580 from VampyrBytes/PlasticBags
Fixes plastic bags suffocating when they shouldn't (#3577)
2016-02-12 13:46:06 -05:00
Crazylemon64
806ee1f9c3 Makes it painfully obvious not to use plain old /turf/simulated/floor
Probably will make some mapping look weird, but that floor doesn't behave
properly - will react to crowbar, but won't actually yield tiles, for
example
2016-02-12 04:18:29 -08:00
VampyrBytes
90c485355f Fixes plastic bags suffocating when they shouldn't (#3577)
As title. Now checks your head slot for the bag rather than relying on a
variable that might not be reset in time
2016-02-12 11:37:19 +00:00
Fox-McCloud
9870151493 Faster get_area 2016-02-12 05:13:57 -05:00
VampyrBytes
46d6182cbc Lying only affects things that don't move you 2016-02-12 09:47:41 +00:00
FalseIncarnate
4d89ef5aba Adds Chimichangas
💀 + 💩 + L
2016-02-12 01:17:43 -05:00
FalseIncarnate
954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05:00
Fox-McCloud
f37a21a91a carp grab fix 2016-02-11 21:45:30 -05:00
TheDZD
6b127b158f Spacepod Tweaks 2016-02-11 20:39:13 -05:00
Fox McCloud
b19dd82cdf Merge pull request #3568 from KasparoVy/Ayy-L'hitstheblunt
Grey Smokeables
2016-02-11 19:00:36 -05:00
Fox McCloud
9caf834f36 Merge pull request #3573 from TheDZD/i-can't-colors
Makes adminhelp colors slightly less blinding
2016-02-11 18:38:04 -05:00
TheDZD
c773f2a010 Makes adminhelp colors slightly less blinding 2016-02-11 18:21:27 -05:00
TheDZD
5df91c7e1f Merge pull request #3557 from Fox-McCloud/spell-icons-fake-nath
Updates Fake Disintegrate and Spell Icons
2016-02-11 18:09:12 -05:00
TheDZD
2a64ec8433 Merge pull request #3559 from Crazylemon64/raginger_mages
Makes mages more ragin
2016-02-11 18:07:27 -05:00