Commit Graph

5156 Commits

Author SHA1 Message Date
LetterJay
ad07c97ab5 Merge pull request #3440 from Citadel-Station-13/upstream-merge-31771
[MIRROR] Fixes atmos machinery examine
2017-10-17 08:54:24 -04:00
LetterJay
1c35ac46e6 Merge pull request #3439 from Citadel-Station-13/upstream-merge-31768
[MIRROR] Trims ahelps
2017-10-17 08:54:14 -04:00
LetterJay
52db4fc0df Merge pull request #3437 from Citadel-Station-13/upstream-merge-31744
[MIRROR] Fixes godhand having no inhand sprite
2017-10-17 08:53:37 -04:00
Leo
201cf2c66b Merge pull request #31771 from tgstation/Cyberboss-patch-5
Fixes atmos machinery examine
2017-10-16 16:48:13 -05:00
Leo
3857bfb2fc Merge pull request #31768 from AnturK/ahelptrim
Trims ahelps
2017-10-16 16:48:04 -05:00
LetterJay
cc96777b6b wrong filepath 2017-10-16 16:46:02 -05:00
LetterJay
1c807d8bb8 donation item 2017-10-16 16:45:33 -05:00
KorPhaeron
74c6e7e23f Fixes godhand having no inhand sprite (#31744)
* Fixes godhand having no inhand

* Correct file paths
2017-10-16 14:34:11 -05:00
LetterJay
f0bc5936b6 Merge pull request #3434 from Citadel-Station-13/upstream-merge-31759
[MIRROR] Fixes apprentices in check antags/roundend list
2017-10-16 14:12:49 -04:00
LetterJay
24631746d4 Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707
[MIRROR] Restores security bombsuit & white bombsuit
2017-10-16 14:12:28 -04:00
AnturK
c85e760eac Fixes apprentices in check antags/roundend list 2017-10-16 12:46:20 -05:00
LetterJay
638290e121 Merge pull request #3433 from Citadel-Station-13/upstream-merge-31765
[MIRROR] Fixed fancy boxes not showing proper content amount.
2017-10-16 10:40:06 -04:00
LetterJay
a3396b8fd0 Merge pull request #3431 from Citadel-Station-13/upstream-merge-31747
[MIRROR] Removes hardcoded "full bottle" icons from several pre-filled reagent bottles
2017-10-16 10:39:59 -04:00
LetterJay
7feae419a1 Merge pull request #3421 from deathride58/consensualaphro
Make Crocin and Hexacrocin require arousal to be on to have lewd effects
2017-10-16 10:39:50 -04: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
8ae369bf77 Update bottle.dm 2017-10-16 07:54:02 -05: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
Jordan Brown
98fb887ccc Merge pull request #31765 from DaxDupont/fancythis
Fixed fancy boxes not showing proper content amount.
2017-10-16 07:15:04 -05:00
LetterJay
1a3745b1f5 Merge pull request #3429 from Citadel-Station-13/upstream-merge-31691
[MIRROR] EI NATH! now causes a flash of light
2017-10-16 07:29:31 -04:00
LetterJay
4b6ebe3fa3 Merge pull request #3428 from Citadel-Station-13/upstream-merge-31710
[MIRROR] Removes mapping error bandaid
2017-10-16 07:29:20 -04:00
LetterJay
3160051499 Merge pull request #3425 from Citadel-Station-13/upstream-merge-31735
[MIRROR] Fixes emotes not checking the right turf (or any turf for that matter)
2017-10-16 07:28:13 -04: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
7824c58539 Merge pull request #3418 from Citadel-Station-13/upstream-merge-31728
[MIRROR] Sunflower makeover, adds missing inhands sprites.
2017-10-16 07:27:31 -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
a5628fe332 Merge pull request #3423 from Citadel-Station-13/upstream-merge-31738
[MIRROR] makes loaded templates call air_update_turf() on bordering turfs
2017-10-16 07:25:52 -04:00
LetterJay
ec41bbc420 Merge pull request #3422 from Citadel-Station-13/upstream-merge-31733
[MIRROR] closed turfs remove themselves from SSair.high_pressure_delta on change
2017-10-16 07:25:44 -04:00
LetterJay
3c0c5db5d9 Update beam_rifle.dm 2017-10-16 06:14:24 -05:00
LetterJay
ee70d961d7 Update firing.dm 2017-10-16 06:13:51 -05:00
LetterJay
11769ef9f8 Update other_mobs.dm 2017-10-16 06:13:41 -05:00
LetterJay
8a14bab2ee Update update_icons.dm 2017-10-16 06:10:06 -05:00
LetterJay
a11a474a94 Merge pull request #3416 from Citadel-Station-13/upstream-merge-31698
[MIRROR] Prevents tiles from being placed on top of buckled mobs
2017-10-16 07:09:30 -04:00
LetterJay
5dd348564a Merge pull request #3415 from Citadel-Station-13/upstream-merge-31690
[MIRROR] You can smash the bulbs in floodlights
2017-10-16 07:09:17 -04:00
LetterJay
a703a599fa Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695
[MIRROR] Makes directional windows only block air if anchored
2017-10-16 07:08:11 -04: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
LetterJay
029d98028a Merge pull request #3410 from Citadel-Station-13/upstream-merge-31713
[MIRROR] Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-16 07:06:28 -04:00
vuonojenmustaturska
11eff73897 Removes hardcoded "full bottle" icons from several pre-filled reagent bottles 2017-10-16 00:00:52 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
MoreRobustThanYou
1b7cd05752 EI NATH! now causes a flash of light (#31691)
i've been reading too much harry potter
2017-10-15 21:04:14 -05:00
Jordan Brown
baf8b578f5 Removes mapping error bandaid (#31710)
* Removes mapping error bandaid

* Update conversion code
2017-10-15 21:02:02 -05:00
Jordan Brown
814bf72d66 Fixes emotes not checking the right turf (or any turf for that matter) (#31735)
* Fixes emotes not checking the right turf (or any turf for that matter)
2017-10-15 19:41:01 -05:00
duncathan salt
fcab4e8a59 makes loaded templates call air_update_turf() on bordering turfs (#31738)
* makes loaded templates call air_update_turf() on bordering turfs

* safety check for OOB turfs; fixes compile error
2017-10-15 19:34:33 -05:00
duncathan salt
3da718d3b1 closed turfs remove themselves from SSair.high_pressure_delta on change (#31733) 2017-10-15 19:32:20 -05:00
deathride58
9799fb071a tfw autotab 2017-10-15 19:28:03 -04:00
deathride58
0cdf695c42 makes crocin and hexacrocin require arousal to be on to have an effect 2017-10-15 19:19:43 -04: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
Onule
5bdadb7d4e Sunflower makeover, adds missing inhands sprites. (#31728)
* New sunflower sprite, added inhand sprites, first time messing with git

* Updates sunflower and variant's sprites, adds new growing stage sprites for sunflower variants, new inhands sprites.

* Made the leaves a bit higher. Das it
2017-10-15 16:34:01 -05:00