Commit Graph

17286 Commits

Author SHA1 Message Date
oranges
ef6aa7db0a Merge pull request #21800 from Shadowlight213/changeturffix
Fixes lavaland cave generation creating airless turfs.
2016-11-29 17:08:09 +13:00
oranges
92e99c3862 Merge pull request #21788 from ChangelingRain/fastalloy
Proselytizing alloy shards is instant
2016-11-29 17:02:55 +13:00
oranges
2d2e0fddd5 Merge pull request #21742 from tgstation/revert-21638-this_isnt_advanced_darkness_this_is_REGULAR_darkness
Revert "Human nightvision"
2016-11-29 09:10:37 +13:00
oranges
4be4ca9dc5 Merge pull request #21779 from ChangelingRain/throughaninterdictionlensdarkly
Interdiction Lenses are more likely to turn off if damaged
2016-11-28 23:06:28 +13:00
Remie Richards
b82f4111be New Devil Obligation: Dance Off (#21765)
* New Devil Obligation: Dance Off
New Devil Spell: Summon Dancefloor

* Typofix

* typofix round 2
2016-11-28 23:04:45 +13:00
XDTM
23906c811a Adds more golem types, adds golem shell creation with adamantine slimes (#21708)
* Diversifies golems

* Golems

* fixes a bug

* Glass golem + species bullet_act support

* Glass shatter

* More golems

* Final changes

* Added to xenobio

* update

* minor space

* Totally bananas

* silly me

* what Joan said

* Updated titanium, plastitanium, and alloy golems.
2016-11-28 18:34:08 +13:00
Shadowlight213
bd192ed901 Fixes lavaland cave generation creating airless turfs. 2016-11-27 14:53:37 -08:00
Joan Lung
69a7602440 Merge pull request #21777 from jughu/Eat-shit-clockmemes
Increases clockwork airlock conversion time from 40 to 60
2016-11-27 16:51:14 -05:00
Jordie
d5bff39b71 Merge pull request #21786 from optimumtact/litanyoffailures
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
Xhuis
ed11869a79 Gives cyborgs the ability to open morgue trays (#21747)
* Gives cyborgs the ability to open morgue trays

* Small balance changes
2016-11-27 23:07:40 +13:00
oranges
0a52797cb3 Merge pull request #21752 from ChangelingRain/breakthehandsofahulkpunchingthewall
Clockwork walls are now about as hard for hulks to break as rwalls
2016-11-27 23:06:00 +13:00
oranges
1f5889303d Merge pull request #21753 from ChangelingRain/quickbindmore
You can now quickbind up to 5 scriptures
2016-11-27 23:05:50 +13:00
uraniummeltdown
000a5fc502 Balancing Borers (#21726)
* borer reproduce chems 100->200, borer random detatch() removed, borer stun halved, borer infesting someone doesn't auto-unhide, borer event weight 20->15

* stun is 3
2016-11-27 23:03:46 +13:00
Xhuis
118fca35b8 Cleanup on aisle 892 (#21745)
* Plastic explosives now delete upon suicide

* Removes some old code

* Allows resisting out of straight jackets

* Verifies roller bed dock functionality

* Fixes lava's article

* Fixes Syndicate pinpointers being stuck to one mode

* Addresses some of @phil235's concerns

* Removes the Highlander left standing message
2016-11-27 22:59:34 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
jughu
904393a6ba Hyenas pride 2016-11-26 11:29:20 +01:00
oranges
2f248b645c Merge pull request #21712 from GunHog/AI_Recovery_Beacon
AI mech pilots are no longer gibbed on mech death + tweaks
2016-11-26 15:07:38 +13:00
oranges
c3106e4574 Merge pull request #21736 from lzimann/grappa
Adds an icon to grappa
2016-11-26 15:06:03 +13:00
oranges
ff5753847c Merge pull request #21737 from ChangelingRain/howhighofachanceisitthatitsjustafakeout
The Ark of the Clockwork Justicar no longer appears above mobs
2016-11-26 15:05:52 +13:00
oranges
8d86c23c47 Merge pull request #21722 from kevinz000/soreloser
[I am dead therefore I must go to github and make bugfixes to not die again.]I am a sore loser
2016-11-25 22:07:29 +13:00
oranges
f67cd8e628 Merge pull request #21707 from swindly/wetleather
Makes drying racks dry leather
2016-11-25 22:06:30 +13:00
Cyberboss
e37f807941 Fixes the false armblade removal timer. Refactors addtimer (#21714)
* Clever girl...

* Make the addtimer unique param safe

* Refactor addtimer calls

* Moved the location of the define so the other SSs can use it
2016-11-25 22:05:58 +13:00
oranges
8cf6fe7575 Merge pull request #21718 from Mervill/status_display_click
Change the AI status display by clicking one
2016-11-25 22:05:16 +13:00
Joan Lung
f89932bb38 You can now quickbind up to 5 scriptures 2016-11-24 21:59:36 -05:00
oranges
c0ef5e59f7 Revert "Human nightvision" 2016-11-25 15:21:33 +13:00
Joan Lung
9fc842c927 The Ark of the Clockwork Justicar no longer appears above mobs 2016-11-24 20:29:12 -05:00
Lzimann
324db72e35 Adds grappa icon and a grappa bottle to booze vending machine. 2016-11-24 23:05:23 -02:00
kevinz000
87dbd65811 [READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)
* vroom

* wew

* a

* b

* morestuff

* .

* a

* .

* .

* basicsprites+extend/retract

* ...

* .

* thanks travis

* woops

* thankstravisv2

* redundence

* ishouldstopmakingsomanygoddamncommits+empdamage

* stuff

* ..

* ion_trails

* fixes_conflict_1

* fix

* compilesnow

* .

* fuck

* WIP: Multi Step Assembly

* thismightfixitthismightnot

* shoe-attachment

* noselfremoval

* wooops

* tweaksandcrashing

* runtimes

* runtimesfuntimes+crash update 1

* thisprobablywontcompile

* stillwip

* githubPLEASEWORK

* fixes conflicts 3/3

* REFACTORSUNTESTED

* fixingconflicts2

* fixingconflicts3/3

* updates

* stuffs

* ...

* stillWIP

* stufffs

* .

* ..

* runtimesfuntimes2

* stuffs2

* conflictfix

* ...

* fuck

* fix

* bah merge conflicts

* knockback_testing1

* conflictfixing...

* mergeconflicts

* plop

* socloseyetsofar

* tweaksandfixes

* conflicts

* fix

* fixes

* fix

* woops

* woops2

* hotfix

* ...

* flufftextandfixes

* test

* ..

* fix1/2

* stuff

* finallysomeoneteachesmehowtofixthisshit

* FIX

* why

* .

* bitflagsshitflags1

* bitflags-shitflags2

* bitflags-shitflags2

* bitflags_shitflags_4

* autofloating

* minerbuffgetthepun?

* notouchingfloors

* ...

* .

* f l o a t

* kek

* kek

* fixes

* fixes2

* sprites
2016-11-25 13:26:43 +13:00
Joan Lung
22c159ad3e Replaces the 'no cache' alert with an alert showing what you need for the next tier (#21689)
* Replaces the 'no cache' alert with an alert showing what you need for the next tier

* please make a base
please

* this can't be more dynamic, no

* duh, I can do this

* much better

* i'm just kor but with clocks
2016-11-25 13:25:56 +13:00
MrPerson
6dc56abd5e Human nightvision (#21638)
* Human nightvision

Humans can see in the dark a little bit around themselves.
-Add pictures here-

Forces clients onto 510 and suggests clients upgrade to 511 in the default config. The suggestion is still commented out but forcing clients to 510+ is mandatory.

Ghosts and brains now actually render the default HUD instead of skipping the whole process. Dead mobs will show their fullscreens. All of the existing ones will skip rendering to dead mobs to keep the existing behavior of not rendering the brute/blindness screens.
Fixes #17389
Probably fixes #19248 need to test

* Darker human nightvision it is
2016-11-25 13:05:41 +13:00
oranges
51382481bc Merge pull request #21699 from Shadowlight213/nobore
Makes borer event admin only
2016-11-25 10:10:59 +13:00
AnturK
e0305a89a1 Merge pull request #21709 from ChangelingRain/belligerentwalk
Fixes Belligerent not updating the hud walk/run button
2016-11-24 21:22:30 +01:00
AnturK
8268f7ddaa Merge pull request #21693 from ChangelingRain/cyborgrepair
Fixes cyborg proselytizers being unable to repair clockwork structures with power
2016-11-24 21:20:18 +01:00
Joan Lung
2a01bbbdc5 Clockcult AIs with borgs 'slaved' to them will convert them when hacking via the robotics console (#21646)
* Clockcult AIs with borgs 'slaved' to them will convert them when hacking via the robotics console

* leeeet's make this more obvious

* "

* this is okay i guess
2016-11-24 21:16:45 +01:00
Mervill
70256e9f8a Removes some stale comments (#21700)
* Stale comments and some redundant string interpolation
2016-11-24 13:27:41 -06:00
Joan Lung
5435eb040d Proselytizing alloy shards is instant 2016-11-24 09:47:33 -05:00
Joan Lung
7d0e240593 Interdiction Lenses are more likely to turn off if damaged
Interdiction Lenses and Tinkerer's Daemons give less CV
2016-11-24 09:31:20 -05:00
Joan Lung
ad9c7141ad Clockwork walls are about as hard for hulks to break as rwalls 2016-11-24 09:15:41 -05:00
kevinz000
7fa49473a9 Update mecha.dm 2016-11-24 06:02:32 -08:00
kevinz000
ad3eb1474b Update mecha.dm 2016-11-24 05:47:12 -08:00
kevinz000
51a886a60f ... 2016-11-24 04:38:27 -08:00
kevinz000
6756b291b6 kek 2016-11-24 04:04:27 -08:00
kevinz000
123bcccbd2 ree 2016-11-24 02:48:27 -08:00
Mervill
11d2fd82bb make sure the user is an ai 2016-11-23 23:51:33 -08:00
Mervill
1abf38cbd1 As the AI: Click an AI status display to bring up the prompt for changing it 2016-11-23 23:10:40 -08:00
swindly
7c2780275d drying rack 2016-11-23 22:22:58 -05:00
Cheridan
2527c06863 Merge pull request #21691 from GunHog/Make_Ripley_Great_Again
Increases mech-mounted plasma cutter effectiveness
2016-11-23 20:56:05 -06:00
GunHog
0a5f57defe AI Mech Recovery
- Allows AIs to be recovered from mech wrecks by hitting the mech with
an AI card.
- Makes the explanation text of the AI's new control REALLY BIG
- Antagonist AIs can now be carded from mechs, and changes the text to
reflect this.
2016-11-23 16:41:31 -06:00
oranges
3c7f7582f1 Merge pull request #21680 from KorPhaeron/lavabase2
Syndicate Lava Base Remap
2016-11-24 10:28:57 +13:00
oranges
fd9904d3d7 Merge pull request #21655 from lzimann/patch-16
Removes multiverse sword once again from wizards
2016-11-24 10:28:29 +13:00