Commit Graph

8835 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
bgobandit
aca5dd84b2 Easy fixes/tweaks. (#22348)
* Fixes a misleading message

* Fixed more bugs, did kor's shit

* Fixes holodeck  monkey message

* does the needful
2016-12-25 16:57:34 +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
Cyberboss
1503cd8f18 Fixes a cardboardbox runtime (#22384)
* Fixes a cardboardbox runtime

* The better way
2016-12-23 13:30:09 +01:00
XDTM
854eb19e9b Refactors mineral golem code (#22354)
* Improves code

* old comment

* p_their actually

* just in case
2016-12-23 09:35:26 +13:00
Firecage
1a23d1ecd6 Makes Grille code a bit more sensible and simpler (#22352)
* Modularizes some grille stuff.

* rverts istype() of attack_by
2016-12-23 09:34:15 +13: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
TehZombehz
e9b6126900 Replaces derelict drone spawn (#22340)
Replaces the drone shells on the derelict space station ruin with unique
drone shell spawns, making them detectable via the orbit command, like
most lavaland ghost role spawners currently are.
2016-12-21 11:54:16 -05: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
Karl Parakenings
ba671b85a2 added distance check for electrocute mob proc in [power.dm] (#22231)
* added adjacency check for electrocute mob proc

* updated all calls to proc enabling range check
2016-12-18 19:55:34 +13:00
Mervill
309adf96c3 Pens can now be placed on top of paper bins :shock: 🚀 (#22195)
* pens can now be placed on top of paper bins :shock: 🚀

* refactor

* fix
2016-12-18 19:49:03 +13: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
Firecage
3648991237 Adds Titanium Airlocks (#22141)
* Adds Titanium Airlocks

* Adds Glass titanium airlock, and non-functional assembly for it.
2016-12-17 10:29:02 +13:00
Mervill
ae61572d0b Notice boards can now have images pinned to them (#22152)
* Notice boards can use authorization

* stock notice boards for the heads of staff

* Title of the UI uses the notice board's name

* Add notice boards for heads of staff to boxstation

* formatting oversight

* noticeboards use proper examinate behaviour for paper

* You can now put images on the noticeboard

* Made interacting with the noticeboard not annoying

* Revert "Add notice boards for heads of staff to boxstation"

This reverts commit 56a30da0957ac3679bcd84744d54c526543802c1.

* code review

* properly restrict locate()
2016-12-16 11:08:20 +13:00
coiax
43a08412a3 Anomalies now have observer-visible countdowns (#22147)
* Anomalies now have observer-visible countdowns

🆑 coiax
add: Anomalies now have observer-visible countdowns to their detonation.
/🆑

- Behind the scenes, moved the detonation code from the event to the
anomalies themselves. May be some differences of lifespan, given we're
going from event ticks to world.time, but meh.

* Changes the name of the anomaly cores
2016-12-16 11:08:05 +13:00
oranges
c007b733df Merge pull request #22160 from jughu/C-y-c-l-e-r
adds cycler shotgun to wardens locker
2016-12-15 14:32:12 +13: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
jughu
ed36797b79 Update security.dm 2016-12-13 06:24:07 +00: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
52c8b57356 Merge pull request #22128 from XDTM/Fixes
Fixes backpack violence
2016-12-12 19:26:22 -05:00
XDTM
42792b1404 RENAME REWRITE SAME THING 2016-12-13 01:17:02 +01:00
XDTM
bc7379c7ed sorry oranges 2016-12-13 01:06:11 +01:00
danno "big fucking moron" gonzales
be20da226c Chaplain costumes and theater masks (#22109)
Ah hah hah ha! Ooh! Majestic! A hunter is a hunter, even in a dream. But, alas, not too fast! The nightmare swirls and churns unending!
2016-12-11 22:48:11 -05:00
XDTM
993989d360 W 2016-12-12 01:20:11 +01:00
XDTM
2cd81e50ca Keep functionality 2016-12-12 00:17:30 +01:00
Joan Lung
e37189b7e5 slowish 2016-12-11 17:56:33 -05:00