Commit Graph

8678 Commits

Author SHA1 Message Date
oranges
fed780fa9b Merge pull request #21540 from Supermichael777/revert-21014-atmosgrenades
Revert "Atmos Grenades"
2016-11-15 16:40:35 +13:00
oranges
d11bb7258a Merge pull request #21529 from Cyberboss/DoTheTruffleShuffle
Storage rustling cleanup/refactor
2016-11-15 16:39:30 +13:00
kevinz000
6581ae2b49 [READY]Slightly buffs Peacekeeper Cyborg Energy Barriers (#21513)
* Update holosign_creator.dm

* Update holosign.dm

* Update holosign.dm

* Update holosign_creator.dm
2016-11-14 19:10:30 +13:00
oranges
646d871739 Merge pull request #21514 from kevinz000/flashbangsopplsnerf
[READY] Flashbangs now ignores same-tile protection properly
2016-11-14 19:06:49 +13:00
uraniummeltdown
3bd538a1b3 Adds raw TC to uplink and 10mm ammo variants (#21498)
* adds raw telecrystals to uplink, can be used to refill uplinks and uplink implants, adds 10mm variants to uplink for traitors and nuke ops

* grammar
2016-11-14 19:02:40 +13:00
Supermichael777
5d9bc48034 Revert "Atmos Grenades" 2016-11-13 19:44:29 -05:00
Cyberboss
0ff7c62984 Removes duplicate fingerprinting 2016-11-13 19:09:47 -05:00
Joan Lung
de1c7b074a Servants of Ratvar can now unsecure and move most Clockwork Structures (#21485)
* Servants of Ratvar can now unsecure and move Clockwork Structures

* anchoring required

* gen

* bleh

* check again

* no stacking wardens, kay?

* alright!

* that too

* smart

* round

* as is done

* hmm

* less effective
2016-11-14 12:47:31 +13:00
AnturK
e1a4e8a1db Adds a ventriloquist dummy. (#21511)
* Dummy inital

* Adds dummies to meta and box.

* Minor inhand touchup

* Spelling and log
2016-11-14 12:04:55 +13:00
Cyberboss
316070be13 Wooweee feeling rustled today 2016-11-13 12:07:04 -05:00
kevinz000
9723cbc0bf woops 2016-11-12 23:36:54 -08:00
Mysak0CZ
87211b3e3d [ready for review]Minor locker tweaks (#21494)
* you can anchor lockers using wrench, minor tweaks

* AIs and Cyborgs procs addition

* Spelling update

* Removed silicon remote control
2016-11-13 17:14:14 +13:00
kevinz000
592fc06e30 Update flashbang.dm 2016-11-12 16:27:12 -08:00
oranges
141b108dd7 Merge pull request #21478 from Cyberboss/RadFix
Fixes silicons getting warm skin when irradiated
2016-11-13 10:48:22 +13:00
Cheridan
0e99bd6100 Merge pull request #21469 from ChangelingRain/pronouns
Couple more pronoun things
2016-11-11 22:33:22 -06:00
Joan Lung
98ad262107 Merge pull request #21462 from KorPhaeron/bedsheets
Bedsheets now go in the neck slot
2016-11-11 14:47:12 -05:00
Cyberboss
75b4b73c50 Fixes #20369 2016-11-11 09:42:45 -05:00
Joan Lung
fbeb7f958f Couple more pronoun things 2016-11-10 17:29:57 -05:00
oranges
c9728d75f6 Merge pull request #21425 from KorPhaeron/bomblavaland
Bombs are no longer capped on the mining z level
2016-11-11 10:28:56 +13:00
Joan Lung
045c6e643b Renames Guvax to Geis (#21445)
* Renames Guvax to Geis

* right
2016-11-10 15:18:15 -06:00
Cheridan
373604639d Merge pull request #21439 from Aloraydrel/CE_BELT
Adds an analyzer to the CE's belt
2016-11-10 12:21:56 -06:00
KorPhaeron
44e3733e64 Bedsheets now go in the neck slot 2016-11-10 02:12:54 -06:00
Shadowlight213
332598e71d Attacking someone with an extinguisher on help intent only stops it if the safety is off (#21402)
* Removes attacking someone with a fire extinguisher on help intent with safeties on doing nothing.

* Changes so the attack is only blocked if the safety is off.

* FALSE
2016-11-10 09:34:12 +13:00
KorPhaeron
629bfb6c5e Cloaks are now cosmetic neck slot items (#21418)
* Cloaks are now cosmetic neck slot items

* Re-orders layers so bags will display above cloaks
2016-11-10 09:30:25 +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
duncathan salt
076d256a47 small atmos changes to transit tubes (#21411)
* small atmos changes to transit tubes, part 1

* small atmod changes to transit tubes, part 2

* Fully remove redundant proc
2016-11-09 10:07:25 +01:00
Razharas
3d3c28efa2 Merge pull request #21407 from optimumtact/martialruntimes
Improves stunbaton code to prevent runtimes and a miscount in charge
2016-11-09 03:26:55 +04:00
KorPhaeron
4ccc67ed27 Bombs are uncapped on mining 2016-11-08 16:42:53 -06:00
Mervill
9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
oranges
0844b8efed Improves stunbaton code to prevent runtimes and a miscount in charge
Previously if the final stun from a stunbaton used all the power in the
cell (putting it below hitcost) it would not properly return the actual
value of the cell.use call, so you would use the energy but not properly
get the stun

The logic of the deductcharge proc has been refactor to avoid this by
explicitly returning the value of cell.use call no matter if the stun
baton is switched off or not

The code was also cleaned slightly to improve readability
2016-11-07 23:55:19 +00:00
Cheridan
14a7a856bb Merge pull request #21391 from Mervill/grammar
Wayward grammar
2016-11-07 17:49:38 -06: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
oranges
2a8b848f9b Merge pull request #21341 from swindly/its
Fixes some grammatical errors
2016-11-08 09:27:53 +13:00
Aloraydrel
c30f34ad90 Analyzer to the CE belt 2016-11-07 08:00:54 -05:00
Mervill
f88859309a wayward grammar 2016-11-06 14:53:41 -08: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
Cheridan
5d5e4de951 Merge pull request #21372 from phil235/pdapenshit
Pda overlays and pAi fix
2016-11-06 00:12:23 -05:00
Joan Lung
0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit
Easy fix bundle
2016-11-05 19:41:27 -04:00
Joan Lung
241e6e75b8 Merge pull request #21359 from phil235/WindowExplosionBlockFix
reinforced window and telehulk bugfixes
2016-11-05 19:33:15 -04:00
Cheridan
3dd35cc0b1 Merge pull request #21365 from ChangelingRain/glowfixes
You can now proselytize false walls + glow fixes
2016-11-05 18:30:59 -05:00
Cheridan
6a885d9500 Merge pull request #21342 from phil235/TransitShit
Fixes transit tubes
2016-11-05 17:21:24 -05:00
PKPenguin321
43692c6bad buffs whetstones (#21339)
makes it so anything sharpened with them becomes is_sharp_accurate
2016-11-05 14:12:20 +01:00
phil235
93ac302a2e Fixes pAI face not being updated when killed by EMP (or any non wipe/suicide death). 2016-11-05 03:22:20 +01:00
phil235
59f2a4e10e Adds some image overlays on PDAs when they had an id (bottomleft corner green light), when their light is on (bottom right corner), when they have an item inserted (top), when they have a pai inserted (screen changes).
Also, altclicking a PDA without an ID now removed the inserted item.
Fixes some bugs. Simplifies id_check() proc.
2016-11-05 03:15:04 +01:00
phil235
b8e5bb22bc Moves bodybag closet into the closet folder where they should be.
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
2016-11-05 00:00:28 +01:00
Joan Lung
990942481f You can now proselytize false walls + glow fixes 2016-11-04 11:53:48 -04:00
Joan Lung
d4643f032c Proselytizer conversion now accounts for existing materials better (#21334)
* Proselytizer conversion now accounts for existing materials better

* shitfuck.

* move the god damn defines
2016-11-04 15:35:00 +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
phil235
48af5e5927 Removed another outdated comment 2016-11-03 19:19:32 +01:00
phil235
b0b5a90bd7 Requested changes 2016-11-03 19:03:04 +01:00