Commit Graph
385 Commits
Author SHA1 Message Date
bawhoppenandCitadelStationBot f8bd9ecf9c Fixes old simple animal humanoid issues (#32214)
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
2017-10-30 06:50:04 -05:00
LetterJayandGitHub 715a2fb918 Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080
[MIRROR] Ice Spiders now use frost oil instead of toxin
2017-10-29 23:37:58 -04:00
KorPhaeronandCitadelStationBot edfc86c895 Halloween race fixes 2017-10-29 12:31:38 -05:00
ArmhulenandCitadelStationBot 9c63e30e2f Ice Spiders now use frost oil instead of toxin (#32080)
* PARASTENG!!

* just monika
2017-10-29 11:02:50 -05:00
ShizCalevandCitadelStationBot c016e1e830 Fixes lightgeist spawning 2017-10-25 23:43:20 -05:00
LetterJayandGitHub 6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883
[MIRROR] Removes duplicate typecaches
2017-10-23 20:16:51 -04:00
ShizCalevandCitadelStationBot 4cc53d68a2 Makes cleanbots clean up remains (#31876)
* Makes cleanbots clean up remains

* Gooooooooo

* Acid_act
2017-10-23 08:38:52 -05:00
Jordan BrownandCitadelStationBot c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
LetterJayandGitHub a1236008f3 Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355
[MIRROR] Code Consistency: luminosity --> light_range
2017-10-23 03:44:46 -04:00
FirecageandCitadelStationBot 25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
Kyle Spier-SwensonandCitadelStationBot e48fb05f06 Fixes quick_attack_loop stack overflow (#31958)
Fixes quick_attack_loop stack overflow
2017-10-21 18:52:31 -05:00
CitadelStationBotandPoojawa d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBotandPoojawa e827f02863 [MIRROR] Fixes various spelling and grammar errors. (#3436)
* Fixes various spelling and grammar errors.

* Update crashedship.dm

* Update listeningstation.dm

* Update augments_chest.dm

* Update augments_chest.dm
2017-10-21 07:10:23 -05:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
CitadelStationBotandPoojawa 953a353ce7 [MIRROR] Fixes Poly lying about his age (#2992)
* Fixes Poly lying about his age

* Update parrot.dm
2017-10-21 05:54:07 -05:00
CitadelStationBotandPoojawa ea99c01820 [MIRROR] Fixes simple mob flying corpses (#3521)
* Fixes simple mob flying corpses (#31794)

* makes simple mobs stop flying when they die

* Update simple_animal.dm

* Fixes simple mob flying corpses
2017-10-21 03:46:00 -05:00
CitadelStationBotandPoojawa fa220bcf9b [MIRROR] Cures cats of their rigor meowrtis (#3530)
* Merge pull request #31907 from Thunder12345/no_more_rigor_meowrtis

Cures cats of their rigor meowrtis

* Cures cats of their rigor meowrtis
2017-10-21 03:43:58 -05:00
LetterJayandGitHub 7fce4c7bcc Merge pull request #3505 from Citadel-Station-13/upstream-merge-31778
[MIRROR] expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode
2017-10-19 09:23:40 -04:00
vuonojenmustaturskaandCitadelStationBot 360d883879 expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
2017-10-19 04:57:49 -05:00
orangesandCitadelStationBot 7517b6ba19 Merge pull request #31852 from Mercenaryblue/tweak_honkbot
You will no longer trip on inactive Honkbots. [Tweak]
2017-10-19 04:07:40 -05:00
LeoandCitadelStationBot 28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
LetterJayandGitHub 568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
LetterJayandGitHub 399d84500c Merge pull request #3419 from Citadel-Station-13/upstream-merge-31139
[MIRROR] Honkbots: The Clown's lil helpers.
2017-10-16 07:27:15 -04:00
kevinz000andCitadelStationBot ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
MercenaryblueandCitadelStationBot 3690fc56c2 Honkbots: The Clown's lil helpers. (#31139)
* Honkbots 0.9.0

Old code, needs testing.

* Honkbots 0.9.1

Small Fixes - Part 1

* Honkbot 0.9.1b

Fixes

* Honkbots 0.9.2

Added sound cooldown, fixes.

* Honkbots 0.9.5

Clown Box & Honkbot Assembly Code

* 0.9.5.a

oops

* Honkbots 1.0.0

Final touches and fixes.
Clown Box finished.
Assembly functioning.
Honkbots tested and ready to go.
Its time.

* Honkbots 1.0.1

Initialize and . = ..()

* Honkbots 1.0.2

Fixes and Changes
====
Nerfed Brute/Thermal Resist
Buffed Health (to avoid 1-shot)
Added HONK_BOT define

* Honkbots 1.0.3

Removed the cardboard assembly from death gibs.
Admin Bwoink removed from emagged soundtrack.
Honkbot now release an evil laugh when emagged.
Fixed strange behaviors on emagged level 1
Added a check against stamping multiple cardboard sheets.
Stamping a Clown Box now plays the bike horn, once.
Clown Boxes no longer get automatically placed in hands.
Various other fixes.

* Honkbots 1.0.3a

* Honkbots 1.0.3.b

Fixes.

* Honkbots 1.0.4

*Added an emote ping upon assembly creation.
*Enabled either Theatre or Robotics for access. ((fixing needing both))
*Honkbots are now more forgiving after being hit.
**Airhorn stun_attack now deals slight ear damage, for about 5 seconds.
**Cardboard no longer drops upon death. Robot arms have 50% chance.
**Using a new get_sfx() list when emagged.
**Optimization and other minor fixes.

* Honkbots 1.0.4.a

Missed it.

* Honkbots 1.0.4.b

use(1) and (client)

* Honkbots 1.0.4.c

Moved proc

* Honkbots 1.0.5

*Code Optimization
*Renaming w/ Pen (how could I even forget this)
*Assembly Defines

I'm afraid I'm simply out of my depth with the suggested use(1) rework.

* Honkbots 1.0.5.c

Reworked cardboard stamping.

It now works in the hands and on the ground, either solo or in stacks, and prevent itself being used in backpacks.

* Honkbots 1.0.5.d

Final

* Honkbots 1.0.5.e

comment

* 1.0.5.f

Optimization

* Honkbots 1.0.5.g

Missed requested stuff

* Honkbots 1.0.6

Requested changes.

* Honkbots 1.0.6a

Oops.

* Honkbots 1.0.6.c

Bugfix - Prevent building in backpacks.
Make sure they spawn on turf.

* Honkbots 1.0.7

one less spawn(0)
flag optimization
else return ..()

* Honkbots 1.0.7.a

Get rids of a lot of client checks at the cost of automatic AI retoration.

* Honkbots 1.0.7.b

Added judgment_criteria()
changed assess_threat to use judgment

* Honkbots 1.0.7.c

final = NONE
2017-10-15 16:44:23 -05:00
Jordan BrownandCitadelStationBot 3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
vuonojenmustaturskaandCitadelStationBot f2413f047f Allows simple animals to qdel, generally (#31680)
* Allows simple animals to qdel, generally

* requested changes
2017-10-14 15:18:07 -05:00
LetterJayandGitHub 45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601
[MIRROR] Fix many instances of "the the"
2017-10-14 15:37:00 -04:00
LetterJayandGitHub fea2807378 Merge pull request #3371 from Citadel-Station-13/upstream-merge-31648
[MIRROR] Medibots will no longer inject people in lockers/sleepers/etc
2017-10-14 10:19:52 -04:00
MoreRobustThanYouandCitadelStationBot 282bc3e5f1 Medibots will no longer inject people in lockers/sleepers/etc (#31648) 2017-10-13 16:26:12 -05:00
militairesandCitadelStationBot 7f26d59541 Fixes Shambrero Penguin names 2017-10-13 11:55:48 -05:00
Jordan BrownandCitadelStationBot bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
LetterJayandGitHub f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
LetterJayandGitHub 07f0a5f503 Merge pull request #3318 from Citadel-Station-13/upstream-merge-31365
[MIRROR] Mega Carp Re-Carpening: Carpatastrophe!
2017-10-12 07:18:35 -04:00
LetterJayandGitHub 992416a9b4 Update carp.dm 2017-10-12 02:56:03 -05:00
duncathan saltandCitadelStationBot c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
ArmhulenandCitadelStationBot c269b062b9 Mega Carp Re-Carpening: Carpatastrophe! 2017-10-12 00:29:21 -05:00
Incoming5643andCitadelStationBot 5711f562f0 when cleanbot cleans a tile, it will now fully cleans the tile (#31548)
As opposed to taking out one stain at a time
2017-10-12 00:29:07 -05:00
Jordan BrownandCitadelStationBot 7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
Tad HardestyandCitadelStationBot 01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
XDTMandCitadelStationBot 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
ArmhulenandCitadelStationBot 62a6867f2e Makes Basilisks gold slime spawnable. (#31358) 2017-10-08 18:30:45 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJayandGitHub 03bd841ac3 Merge pull request #3191 from Citadel-Station-13/upstream-merge-31344
[MIRROR] Lightgeists are gold core spawnable
2017-10-07 01:07:03 -04:00
ArmhulenandCitadelStationBot a42bf62334 Lightgeists are gold core spawnable (#31344)
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.

* ez

* honk
2017-10-06 21:30:23 -05:00
ArmhulenandCitadelStationBot 0a3949968d Makes Wumborian Fugu gold core spawnable (#31359) 2017-10-06 21:28:04 -05:00
XDTMandCitadelStationBot 5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
LetterJayandGitHub f418c066c6 Merge pull request #3144 from Citadel-Station-13/upstream-merge-31299
[MIRROR] Experimental fix for #29663
2017-10-05 08:45:55 -04:00
RandomMarineandCitadelStationBot fb7a0d7606 Experimental fix for bloom issue (#31299) 2017-10-04 23:25:06 -05:00
LeoandCitadelStationBot 39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
2017-10-04 19:26:38 -05:00