Commit Graph

2731 Commits

Author SHA1 Message Date
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00: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
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
oranges
f0806cd368 Merge pull request #21647 from KorPhaeron/buildyourownshuttle
Allows captains to organize a shuttle build event
2016-11-25 10:13:53 +13:00
Joan Lung
6f2c8bc9f4 Fixes internals buttons (#21696)
* Fixes internals buttons

* i'm very happy with my own ui tbh
2016-11-24 21:20:32 +01:00
oranges
3c7f7582f1 Merge pull request #21680 from KorPhaeron/lavabase2
Syndicate Lava Base Remap
2016-11-24 10:28:57 +13:00
Joan Lung
e86d782625 Merge pull request #21639 from AnturK/fancybuttons
Makes action buttons use the hud themes.
2016-11-22 16:25:42 -05:00
KorPhaeron
3c769285e4 Syndicate Lava Base Remap 2016-11-21 20:37:05 -06:00
Leo
cc0071e720 Adds a config file to enable/disable shuttles from being bought (#21642)
* Adds a config file to enable/disable shuttles from being bought

* Remove useless comment
2016-11-22 11:53:51 +13:00
Joan Lung
f53fc311e6 Clockcult AIs get the ability to listen in through cameras (#21643) 2016-11-22 11:52:34 +13:00
pubby
7d9c7ec44f PubbyStation bugfixes (#21637)
- fix disposalpipe in brig
- fix missing chapel light
- fix cargo sec filing cabinet
- fix science scrubber pipe
- add station maps
- add atmos waste line
2016-11-22 11:48:56 +13:00
Cheridan
8696a4381b Merge pull request #21621 from ExcessiveUseOfCobblestone/patch-2
Hot-Tweak for Radstorms, Shuttle Boogaloo
2016-11-20 12:06:33 -06:00
Joan Lung
5224512d55 Replaces Servant cyborg emagged modules with some limited scripture and tools (#21632)
* Replaces Servant cyborg emagged modules with some limited scripture and tools

* not THAT limited

* sorry standard borg

* bugfix
2016-11-20 17:51:11 +01:00
KorPhaeron
b3baa8314c Build your own shuttle 2016-11-19 15:28:25 -06:00
AnturK
b2ff4cfd33 Makes action buttons use the hud themes. 2016-11-19 14:05:06 +01:00
KorPhaeron
594e34576e Syndicate Lavabase Ruin (#21550)
* Syndicate Base

* Secret Base

* Forgot a file

* Gives the base red floors and syndie walls

* Fixes compile errors

* Makes sure you can't steal the bombs

* Adds some uranium
2016-11-19 13:44:34 +13:00
ExcessiveUseOfCobblestone
758380f87a Hot-Tweak for Radstorms, Shuttle Boogaloo
Radstorms would magically teleport to lavaland with the shuttles, so instead of trying to stupidly write L O R E as to why this occurs  I just figured to make the mining shuttle [this includes gulag shuttle as well] radproof.
2016-11-18 00:11:35 -05:00
kevinz000
caeec1da09 . 2016-11-17 00:19:09 -08:00
Joan Lung
e662f5d5b1 Clockcult AIs no longer require APC power (#21552)
* Clockcult AIs no longer require APC power

* some, maybe?
2016-11-17 12:29:49 +13:00
Joan Lung
d691faba1b Clockcult Cyborgs can charge from Sigils of Transmission (#21558)
* Clockcult Cyborgs can charge from Sigils of Transmission

* better

* rip
2016-11-17 12:29:21 +13:00
Joan Lung
f162d4d84a Refactors scripture quickbind (#21563)
* Refactors scripture quickbind

* =
2016-11-17 12:28:57 +13:00
pubby
d1010a7d53 Emergency storage protects from rad storms (#21565) 2016-11-17 12:28:47 +13:00
Shadowlight213
7619752290 Fixes sqrt of a negative number and null blood dna runtimes (#21562) 2016-11-17 12:28:32 +13:00
KorPhaeron
615ead8530 Pubby Shuttle Doesn't Work 2016-11-15 12:25:15 -06:00
KorPhaeron
3221c630c5 Adds the luxury shuttle, adds descriptions to other shuttles 2016-11-13 22:31:28 -06:00
KorPhaeron
0435d7ae01 Asteroid Shuttle 2016-11-13 13:15:36 -06:00
KorPhaeron
ac065db80f Captain can buy a new escape shuttle (#21398)
* Captain can buy a new escape shuttle

* A messy way to fix/avoid the issue

* Hopefully fixes potential href exploit

* Makes the code better so oranges wont yell at me anymore
2016-11-11 10:22:46 +13:00
Shadowlight213
c2d0cf3066 Allows the possible roundstart random AI laws to be customized in config. (#21414) 2016-11-10 09:27:57 +13:00
uraniummeltdown
ea81370dce Cortical Borers (#21118)
Adds cortical borers, a midround antag originally from Bay. The code here is from yogstation, baystation and paradise station.

Borers are little brainslugs that when adjacent to a human can infest them. They can supply you with useful chemicals such as medicines and meth, and can revive you from the dead if they have maximum chemicals. They can also take over your body, putting them in control of you while you become a "captive mind". A captive mind can take back control by doing Resist. Health analyzers show borers in people, while medHUDs show borers in control. If you have Sugar in your body the borer can do nothing, it gets kicked out of control if it's controlling and becomes docile. Organ Manipulation surgery on head to remove the borer. If the brain of the body gets removed (decapitation, brain removal surgery, gibbing) the borer falls out of the host and loses control if they were controlling. Changelings can remove borers with Anatomic Panacea or Lesser Form (or Last Resort). Borers can reproduce and have an objective to escape on the shuttle with X hosts alive.
2016-11-10 09:25:41 +13:00
Joan Lung
3ecdd5b13c You can now quickbind most Scripture to action buttons (#21379)
* You can now quickbind most Scripture to action buttons

* fixes

* short descs

* slow updating may be bad

* that'd be very bad

* no flickering

* center

* short&sweet

* fixes
2016-11-08 11:33:08 +13:00
pubby
c5609f7dae PubbyStation update #2 (#21345)
* PubbyStation Update

- add space monastery + chaplain job
- add a white ship
- add pre-built turbine to toxins
- add side door to bar
- add more floor decoration (thanks Tacolizard!)
- add pick+bag to aux closet
- rearrange viro to be more efficient
- increase mineral yield of bomb-testing asteroid
- fix faulty wiring in brig
- other stuff I forgot

* Add even more detailing

* Whoops forgot to fix some names

* god damnit

* aaaaaaaaaaaaaaaaaa

* Move pubbystation-specific code into map folder.

I don't think this is such a good idea.

* More PubbyStation detailing

* Add two missing fire alarms

* Add library scanner to library

whoops
2016-11-08 09:26:45 +13:00
Militaires
889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201)
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
2016-11-07 09:01:41 +13:00
Joan Lung
241e6e75b8 Merge pull request #21359 from phil235/WindowExplosionBlockFix
reinforced window and telehulk bugfixes
2016-11-05 19:33:15 -04:00
PKPenguin321
44594790a9 krav maga touchup (#21337)
* krav maga touchup

Fixes a bad check for when to play the kick hitsound

* clamps losebreath/silence on lung punch/neck chop to 10

also tweaks leg sweep desc

* hopefully fixes the clamps
2016-11-04 13:29:42 +01:00
phil235
8cb3736221 Fixes turf having two contents_explosion()
Fixes hulk plus telekinesis being able to hulk smash things from a distance.
2016-11-04 00:33:51 +01:00
oranges
70d0b3d544 Merge pull request #21306 from XDTM/MinusPlusSpam
Removes virus DNA Restoration's healing overlay
2016-11-03 15:20:26 +13: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
AnturK
8a66f3147b Fixes two more runtimes (#21278)
* I don't know what this equation is supposed to do, but byond does not support imaginary numbers out of the box

* Sanity check for bombs

* Assume 0 value if negative.

* There is no revert commit button on github.
2016-10-31 13:37:08 -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
XDTM
cb59cfb65b Removes + bloat 2016-10-31 10:42:40 +01:00
Leo
03b4df6490 Fixes a runtime with weather 2016-10-30 11:59:42 -02: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
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
Lzimann
90d76b652c You can see your own attack log once again 2016-10-28 17:35:22 -02:00
chowdermcarthor
c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
Joan Lung
40d331ab5a The Judicial Visor no longer requires an open hand to use (#21138)
* The Judicial Visor no longer requires an open hand to use

* SMITE

* ew ew ew
2016-10-24 22:54:04 +13:00
Joan Lung
5d878656c7 Fixes a bug with wraith spectacles 2016-10-20 23:06:08 -04:00
Joan Lung
30499f6fc1 Wraith Spectacles will now slowly repair the eye damage they do (#21009)
* Wraith Spectacles will now slowly repair the eye damage they do

* acceptable to fruit
2016-10-21 15:50:02 +13:00
Joan Lung
7f89fdf39f The range for combat-y visible messages is now a define (#21077) 2016-10-21 15:20:14 +13:00