Commit Graph

1147 Commits

Author SHA1 Message Date
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
LetterJay
655478e014 Merge pull request #3485 from Citadel-Station-13/upstream-merge-31774
[MIRROR] reorder carbon destroy to fix ghosting
2017-10-20 10:32:29 -04:00
CitadelStationBot
f19665e698 [MIRROR] Fixes another stack overflow in pull code (#3515)
* Merge pull request #31905 from AnturK/anotherloop

Fixes another stack overflow in pull code

* Fixes another stack overflow in pull code
2017-10-20 01:42:18 -05:00
LetterJay
72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819
[MIRROR] Fixes AI visiblity checks
2017-10-19 09:24:28 -04:00
LetterJay
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
LetterJay
bffdbf72fb Merge pull request #3503 from Citadel-Station-13/upstream-merge-31852
[MIRROR] You will no longer trip on inactive Honkbots. [Tweak]
2017-10-19 09:22:26 -04:00
LetterJay
9d967c4b09 Merge pull request #3502 from Citadel-Station-13/upstream-merge-31813
[MIRROR] Cleans up set and adjust procs for disgust and drugginess a bit
2017-10-19 09:21:23 -04:00
LetterJay
c690ee90e5 Merge pull request #3496 from Citadel-Station-13/upstream-merge-31609
[MIRROR] Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes
2017-10-19 09:12:26 -04:00
LetterJay
d07b44268c Merge pull request #3487 from Citadel-Station-13/upstream-merge-31820
[MIRROR] Humans now use the generic fire sprite if they have 3 or less firestacks
2017-10-19 08:57:29 -04:00
LetterJay
b31d291ede Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753
[MIRROR] Radiation makes you vomit blood and some more balance changes
2017-10-19 08:57:18 -04:00
YPOQ
d04818e6f9 Fixes AI visiblity checks (#31819) 2017-10-19 05:42:52 -05:00
vuonojenmustaturska
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
oranges
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
oranges
8c750341dc Merge pull request #31813 from Qustinnus/IMGONNACLAMPEM
Cleans up set and adjust procs for disgust and drugginess a bit
2017-10-19 03:55:17 -05:00
kevinz000
0aa2e6b6a2 Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes (#31609)
* Update alert.dm

* better fix
2017-10-19 02:01:14 -05:00
MoreRobustThanYou
dc74b9d488 Humans now use the generic sprite if they have 3 or less firestacks (#31820)
To show that they're still on fire, but not AS on fire as you would be with 4+ firestacks
2017-10-18 10:18:14 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
Poojawa
1966b9b052 Update carbon.dm 2017-10-18 08:53:55 -05:00
Leo
636f39ce97 reorder carbon destroy to fix ghosting 2017-10-18 07:35:15 -05:00
Leo
5ad2b5d866 Merge pull request #31830 from ShizCalev/geiger-borg
Gives engi borgs geiger counters
2017-10-18 07:24:53 -05:00
LetterJay
250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630
[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
LetterJay
45c96ae08e Merge pull request #3475 from Citadel-Station-13/upstream-merge-31821
[MIRROR] Removes toggle camera light verb
2017-10-18 07:39:15 -04:00
LetterJay
9036bc1d5d Merge pull request #3474 from yourdoom9898/master
Removed "You feel very bloated!" chat message
2017-10-18 07:39:05 -04:00
LetterJay
92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809
[MIRROR] Cleans up some istypes not using helpers
2017-10-18 07:37:43 -04:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
YPOQ
b643de63f5 Removes toggle camera light verb (#31821) 2017-10-17 23:18:52 -05:00
yourdoom9898
920a51694d Add files via upload 2017-10-17 21:18:05 -05:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
Leo
88486f97ca Merge pull request #31795 from AnturK/random-runtimes
Random runtime fixes.
2017-10-17 09:20:55 -05:00
LetterJay
9a90445554 Merge pull request #3455 from Citadel-Station-13/upstream-merge-31660
[MIRROR] Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities
2017-10-17 08:59:28 -04:00
LetterJay
dc17bfd316 Merge pull request #3453 from Citadel-Station-13/upstream-merge-31750
[MIRROR] Prevent creampie overlays from stacking.
2017-10-17 08:58:39 -04:00
LetterJay
7526b3cb94 Update human_defines.dm 2017-10-17 07:46:05 -05:00
kevinz000
87b84cedf0 Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities (#31660)
* Update projectile.dm

* fixes projectiles
2017-10-17 03:51:10 -05:00
Mercenaryblue
06ea404a28 Prevent creampie overlays from stacking. 2017-10-17 03:48:45 -05:00
kevinz000
a41725a955 Atmospherics Multilayer Pipes (#30972)
* 1

* rpd

* 3

* 4

* 5

* 6

* 7

* 8

* wew

* src. and underlays

* update

* woops

* misspelled params

* reviews

* fixes

* fixes

* better checks and layer crap

* Update RPD.dm

* Update pipe_construction.dm

* 3 layers, fixes

* woops i didn't update defines correctly

* dunc

* Fixes

* Fixes

* fixes

* fixes some more bullshit

* fixes

* fixes

* not needed

* makes attachment sprites prettier or uglier i dunno

* Unary flag

* sprite fix??

* fixes...

* sprite fixes
2017-10-17 00:49:12 -05:00
LetterJay
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
LetterJay
0f5fcfb44e Merge pull request #3417 from Citadel-Station-13/upstream-merge-31642
[MIRROR]  Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons
2017-10-16 10:39:30 -04:00
LetterJay
75a4f22143 Update update_icons.dm 2017-10-16 07:53:19 -05:00
LetterJay
6f35f66dca Update update_icons.dm 2017-10-16 07:24:08 -05:00
LetterJay
e4d2609800 Merge pull request #3420 from Citadel-Station-13/upstream-merge-31665
[MIRROR] Adds logging crew manifest to seperate file
2017-10-16 07:28:03 -04:00
LetterJay
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
LetterJay
8a14bab2ee Update update_icons.dm 2017-10-16 06:10:06 -05:00
LetterJay
74bc1be6c2 Merge pull request #3412 from Citadel-Station-13/upstream-merge-31705
[MIRROR] Fixes tendril possession
2017-10-16 07:08:02 -04:00
LetterJay
d5d0fa919a Merge pull request #3411 from Citadel-Station-13/upstream-merge-31714
[MIRROR] Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-16 07:06:37 -04:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
AnturK
64b1be05ff Adds logging crew manifest to seperate file (#31665)
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
2017-10-15 16:56:48 -05:00
Mercenaryblue
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