Commit Graph

5575 Commits

Author SHA1 Message Date
oranges
58e21ba5a8 Merge pull request #22433 from lzimann/lzimann-patch-1
Fix lollipop dispenser message
2016-12-26 14:39:49 +13:00
oranges
a5a5dcdeba Merge pull request #22416 from Militaires/kill_me
fixes my glass message tweak fuck-up
2016-12-25 16:20:03 +13:00
Joan Lung
95af0534f6 MMI'd clockcultists put in AI cores will properly lose clockcult status (#22369)
* MMI'd clockcultists put in AI cores will properly lose clockcult

* uuuuugh

* fix the core while we're at it

* "

* mrrp

* this will also follow you around

* hmm
2016-12-25 16:18:55 +13:00
oranges
2e936a0db7 Merge pull request #22425 from Shadowlight213/branchnametbd
Fix bundle
2016-12-25 16:14:33 +13:00
AnturK
85669e6746 Implants work on /living mobs (#22392) 2016-12-24 13:44:34 -05:00
Leo
80852b70f6 Fix lollipop dispenser message 2016-12-24 12:15:41 -02:00
oranges
c3014a47d4 Merge pull request #22309 from optimumtact/destroyisconnectedtotheunequipprocunequipisconnectedtothedropprocdropprocisconnectedtotheunweildprocunwieldprocisconnectedtothedestroyproc
Fix a qdel loop in two handed weapons
2016-12-24 18:59:02 +13:00
Shadowlight213
5dd264102e Adds arrival shuttle to radstorm protected areas
Fixes spider structures having null armor
Fixes division by 0 with hellcan
Fixes runtime in automatons
Fixes runtime with recharger in modular computer destroy
Fixes runtime in power monitor
2016-12-23 18:50:10 -08:00
bgobandit
666f28aa49 Adds lumps of coal. (#22346) 2016-12-23 09:33:22 +13:00
coiax
243fd295b4 Cyborg upgrade board tweaks (#22211)
* Cyborg upgrade board tweaks

🆑 coiax
add: Cyborg renaming boards cannot be used if no name has been entered.
del: Cyborg rename and emergency reboot modules are destroyed upon use,
and not stored inside the cyborg to be ejected if modules are reset.
/🆑

Reasons: Because being renamed "default name" isn't fun, and it means
you have to hang around to be renamed AGAIN. And for lore/balance/sanity
reasons, you don't get to get the reboot board back after you used it;
try dying less.

* Naming changes, and transformer tweak

- A new unnamed cyborg will copy the user's prefered cyborg name if
possible, defaulting to the old format if there's no preference.
- A rename board with no setting will apply the cyborg's default name,
if one exists, see above.
- Cyborg transformers (from the traitor AI) will no longer destroy all
items.

* Made behaviour more consistent

* Fix spelling
2016-12-23 09:31:03 +13:00
militaires
edc58d99ac aaaaaaaaaaaaaa haaaaaaaaasaaaaaaaaaaaayaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-12-22 16:52:34 +03:00
Joan Lung
b480a8bada Merge pull request #22314 from Shadowlight213/clothes
Adds 2 performers outfits.
2016-12-20 13:33:02 -05:00
Cheridan
6535759999 Merge pull request #22304 from XDTM/Abfixors
Fixes a couple of abductor bugs
2016-12-19 20:00:02 -06:00
Shadowlight213
3f70fcd134 adds 2 performer's outfits 2016-12-18 23:44:38 -08:00
oranges
020c6573c5 Fix a qdel loop in two handed weapons
The offhand was deleted in unwield which can be called by dropped, which
can be called by unequip, which can be called by Destroy

By explicitly using wield as a guard, we avoid this
2016-12-19 04:12:56 +00:00
kevinz000
079b377172 [READY]PAI PATCH 2 (#22214)
* shit

* shit2

* ...

* ....

* ...

* stuffs

* fixes

* dup

* stuff

* lights and jets

* ...

* wew

* ...

* ...

* wew

* ...

* ..

* .

* Update life.dm

* Update life.dm
2016-12-19 15:33:34 +13:00
XDTM
56368cacc8 Fixes things 2016-12-19 00:44:27 +01:00
Supermichael777
64ab376212 Makes the checks used by bibles better (#22171)
* makes these checks more flexable

* oh hai mark

* praise jesus

* magicaly a better understanding of how to structure if checks lets me cut 2 lines

* wew

* spellcheck

* i shoudent code drunk

* weeeeew

* llllllaaaaaadddddd

* madcusbad

* i realy should learn desktop git

* wew

* Im just so sorry

* because we can't be having the power of atheism melting clockcult.
2016-12-19 11:34:57 +13:00
Haevacht
a6711a7003 Tomb of the Dragoon, and the Sky Bulge lance (#22270)
* Sky Bulge Commit mk2

WORK THIS TIME.

* Indentation.

* Jordbord's suggestions

Incorporated. The bone spear line was also doubletabbed I was set up!

* FUCKING INDENTATION

* the flan update

they don't exist in world but here have a mob

* we fireflans now

also isliving is in now, just gotta actually map a thing

* the tomb update

it's bigger now

* .gitignore revert

* workpls

* Revert ".gitignore revert"

This reverts commit 1fefd34fc7c0dbc8f1f353a95e53665e03ba75cf.

* workthistime

* Revert "workthistime"

This reverts commit 214509d5abda941c470708431536ccd715334e8e.

* well it's the closest gitignore fix so far

* fix dme change

will need to be loaded for the map part to work though

* gitignorerevert take 43

* jordbord fix mk 2

* includes flan.dm in the .dme
2016-12-19 00:12:12 +11:00
MrPerson
94eac6ca0e Fix electric chairs not working sometimes (#22250)
Fixes #22155
2016-12-17 18:25:37 -05:00
danno "big fucking moron" gonzales
5a0c2808af fixes #22222, and also a costume (#22235)
* fixes autodrobe not stocking past 81 items

* villain number one!!
2016-12-17 14:25:34 -05:00
KorPhaeron
0e8a1d975d These things also belong in a museum (#22139)
* Curator Items

* Spawns in his bookbag because where else would this stuff go

* Revert "Spawns in his bookbag because where else would this stuff go"

This reverts commit c3a8613b01a8ac99b0d44e7eeb2e69fa8ca5801c.
2016-12-15 13:40:30 +13:00
oranges
a40b3eede7 Merge pull request #22204 from bgobandit/gamebreaker
Removes the Head of Personnel
2016-12-15 11:31:54 +13:00
bgobandit
1ce92049e3 Fixes a typo 2016-12-14 17:29:26 -05:00
coiax
4556cf5e29 Adds multiple upgrades for Medical cyborgs (#22149)
* [WIP] Adds multiple upgrades for Medical cyborgs

🆑 coiax
add: Adds upgrades for the medical cyborg!
add: The Hypospray Expanded Synthesiser that adds chemicals to treat
blindness, deafness, brain damage, genetic corruption and drug abuse.
add: The Hypospray High-Strength Synthesiser, containing stronger
versions of drugs to treat brute, burn, oxyloss and toxic damage.
add: The Piercing Hypospray (also applicable to the Standard and
Peacekeeper borgs) that allows a hypospray to pierce thick clothing and
hardsuits.
add: The Defibrillator, giving the medical cyborg an onboard
defibrillator.
/🆑

- [ ] Price the material cost of the boards appropriately
- [ ] Get the defib upgrade working

* Got the defib working

* Adjusted research and costing levels

* Missed a close paren
2016-12-15 10:50:13 +13:00
XDTM
7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00
PKPenguin321
9f8be45eac adds Shake() and clusterbuster/random (#22129) 2016-12-13 13:46:06 +01:00
kevinz000
bb80984957 [READY: I DID TEST]I pulled a goofball and broke pAIs (#22161)
* ghost notifications

* FUCK

* fuck2
2016-12-13 21:06:51 +13:00
oranges
910aebbec1 Revert "Reduces tool speed" (#22157) 2016-12-12 23:55:52 -05:00
Razharas
02aebfc26d Merge pull request #22126 from ChangelingRain/slowtools
Reduces tool speed
2016-12-13 08:48:40 +04:00
kevinz000
1400a0d525 YOG pAIS PART 1 - MOBILE CHASSIS (#21871)
* pAI Candidate Verb

* sprites

* fuckxenos

* ...

* animal+alien

* ...

* ...

* ...

* progress

* ...

* .

* ...

* fixes

* ...

* ...

* ...

* ghostUI

* .

* .

* ...

* fixes

* ...

* BUNNIES

* ....

* ...

* merf

* nerfs
2016-12-13 14:47:03 +13:00
Joan Lung
e37189b7e5 slowish 2016-12-11 17:56:33 -05:00
Joan Lung
f30041b9b0 Reduces tool speed 2016-12-11 17:31:38 -05:00
KorPhaeron
e74daaa50c Fixes stun batons (#22103) 2016-12-11 15:28:57 +01:00
coiax
1428f3f532 Cyborgs have a reset module wire (#22016)
* Cyborgs have a reset module wire

🆑 coiax
add: Cyborgs now have a reset module wire, that when pulsed, triggers
the cyborg's reset module hardware.
/🆑

Because they can't touch it themselves for software reasons. Now you can
ask random assistants to reset you in a pinch, or do it on the FRONTIER.

* Upgrade ejection, removed reset board
2016-12-11 19:55:03 +13:00
Cheridan
2dd1a87345 Merge pull request #22083 from ChangelingRain/multiplierspeed
Refactors toolspeed to be a multiplier instead of a divisor
2016-12-10 19:22:44 -06:00
blockheads
60b5f9d4b0 PDA fix #22038 (#22060)
* reset it

* fixes #22038, issue where pda wasn't displaying holding id/pen when using the messenger
2016-12-09 21:11:49 -05:00
Joan Lung
e6df49f3de Revert "Removes left inhand files, automatically mirrors inhands" (#22085) 2016-12-09 18:27:25 -05:00
Joan Lung
43ce2667f4 Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed 2016-12-09 18:03:43 -05:00
Joan Lung
a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
oranges
f06766b3bb Merge pull request #22032 from KorPhaeron/iconreflections
Removes left inhand files, automatically mirrors inhands
2016-12-10 10:27:42 +13:00
oranges
54988003e5 Merge pull request #22036 from Mervill/stale_comments_2
These comments where removed by me.exe, just now
2016-12-09 14:22:53 +13:00
ExcessiveUseOfCobblestone
dccde22917 Customization in its prime! (#22011)
* Customization in its prime!

* GO AWAY
2016-12-09 13:20:45 +13:00
oranges
037aed94f7 Merge pull request #22022 from XDTM/StoRage
Fixes deleting items in storages not updating the HUD
2016-12-09 13:19:32 +13:00
Mervill
8daf8eab09 The light replacer can now consume glass shards (#21993)
* The light replacer can now consume glass shards to create bulbs

* woops

* Buff glass shards to be worth %75 precent of a glass sheet (currently 3)
2016-12-09 09:08:03 +13:00
Mervill
417c50efa2 These comments where removed by me.exe, just now 2016-12-08 01:48:46 -08:00
Kyle Spier-Swenson
dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
KorPhaeron
ace673e829 Removes left inhand files, automatically mirrors inhands 2016-12-07 23:34:12 -06:00
XDTM
118849dac3 This was it. This is all i needed to do and it took me more than 4 hours to find it. Fuck me.
Also thanks to Remie for pointing me in the right direction.
2016-12-08 01:29:35 +01:00
Militaires
9bedd7d414 fixes people "walking over the glass shard!" when they're on the ground, changes message. (#21918)
* hopefully one and only commit

* i fail myself once again

* done

* me a dumbass!
2016-12-07 09:39:01 +13:00