Commit Graph

1873 Commits

Author SHA1 Message Date
CitadelStationBot
df15bbe0f0 [MIRROR] New & Fixed AI VOX Sound Files (#6003)
* New & Fixed AI VOX Sound Files

* Update vox_sounds.dm
2018-03-19 21:15:34 -05:00
deathride58
087255b1f1 Merge pull request #5904 from Poojawa/sprite-tweaks
Ckey locks on Sprite_accessories!
2018-03-17 23:57:16 +00:00
deathride58
a9f8c70d62 Merge pull request #5986 from Citadel-Station-13/upstream-merge-36364
[MIRROR] Changes stormtrooper ammo to 10g slugs
2018-03-17 23:54:33 +00:00
deathride58
d30be811be Merge pull request #5979 from Citadel-Station-13/upstream-merge-36410
[MIRROR] Fixes dupe and runtime issues with Rod of Asclepius
2018-03-17 23:52:52 +00:00
deathride58
1fc5fe361c Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393
[MIRROR] Fixes bluespace radio potions
2018-03-17 23:49:02 +00:00
deathride58
b0f4508392 Merge pull request #5967 from Citadel-Station-13/upstream-merge-36130
[MIRROR] [READY] Refactors wet floors to a component
2018-03-17 23:47:15 +00:00
81Denton
f82456fd7f Changes stormtrooper ammo to 10g slugs (#36364)
* pulse slug instead of buckshot

* 10 gauge baby

* 10g name
2018-03-17 08:47:24 -05:00
TheDreamweaver
49a772b6b7 Fixes dupe and runtime issues with Rod of Asclepius (#36410)
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
2018-03-17 08:22:38 -05:00
oranges
e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio
Fixes bluespace radio potions
2018-03-17 07:53:37 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
AnturK
80e046572f Allows traitor AI's to take direct control of turrets. (#36154)
* Allows traitor AI's to take direct control of turrets.

* Adds some icons
2018-03-17 07:53:01 -05:00
deathride58
8923bb9488 Small combat balancing: Small crawling nerf, Esword buff (#5937)
* adds a delay and message to crawling underneath people

* makes eswords take less stamloss to swing around, lays down groundwork for later parts of combat reworks

* FUCK
2018-03-16 03:27:30 -07:00
CitadelStationBot
0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955)
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
2018-03-15 20:50:10 -05:00
CitadelStationBot
89f37cc8b7 [MIRROR] Fixes broken bot icons (#5952)
* Merge pull request #36379 from ShizCalev/bot-icon-fixes

Fixes broken bot icons

* Fixes broken bot icons
2018-03-15 07:20:24 -05:00
Poojawa
6784c4e6a7 Update carbon_defense.dm
I don't even know if this fixes anything but w/e
2018-03-14 18:53:57 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
2018-03-12 07:01:54 -05:00
deathride58
1c0b13ecfb [READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)
* part 1 - resist out of resting, move and interact with the world while resting, and stamina regen nerf

* makes beepsky check for stuns instead of knockdowns, adds message for getting up, makes gravity reduce standup time, and more

* sprinting, staminacrit, balance changes, and more

* adds stamina modifier to clickdelay, makes items deal stamina damage to the user when attacking, buffs resting stamina regen

* combat mode, ability to toggle right-click context menu on/off, basic combat mode QOL, lays groundwork for 2-handing any item

combat mode toggle sound is from Interbay.

* commits dme changes

* unarmed combat stamina, ability to right click in combat mode, balance changes

* tosses in the HUD icons for later-ish

* rolls back admin.txt

* lotsa UI stuff

* stamina checks, some balance stuff

* adds support for best ui, adds right click to flush disposals, removes aggressive grab pinning in favor of neckgrab chokeholding

* quick dogborg patch while i figure out what do do with them

* oops - fixes prefbreaking for screenshake

* trying to sprint from an elevated surface onto lower ground will now knock you down

* right click to pull fire alarm, lets you bully people by pulling chairs out form under them, makes attacking objects cost stamina

* makes accidents during slipping less likely to occur while combat mode is active, makes tripping off elevated surfaces cause accidents

* makes pumping shotguns cost a tiiiny bit of stamina

* makes eyestabbing and batoning cost stamina

* makes failing stamina checks error out properly, adds stamina check to shotgun pumping

* adds stamina check for chair pulling

* readds aggressive grab pinning

* fixes bug with being buckled preventing interaction

* adds recoveringstam check to incapacitated

* reduces stamina cost for attacking

* oh this too

* fixes bug where you can get stuck in recoveringstam if your stamina suddenly becomes 0 while you're in staminacrit

* makes monkey transformation inherit staminaloss

* adds the ability to wave or shake your fist at someone via right click

* grammar and span closing

* 99 annoying little bugs on the wall, 99 annoying little bugs. take one down, pass it around, 864 gamebreaking bugs on the wall

* more distant right-click emotes.

* buffs standing stamina regen a tiiiiiiny bit

* adds aiming down sights for guns, makes firing guns cause trace amounts of staminaloss

* crusher powercreep - gives crushers the ability to heal staminaloss

* item throwing buff

* adds 1:1 HUD layout

* hopefully fixes issue with recoveringstamcrit not updating

* giant hipfire nerf

* halves the effect of staminaloss on movement speed

* makes stamina recover faster in staminacrit, makes it easier to get disarmed out of combat mode

* get_weight(), movedelay health_deficiency tweaking, combat and resting checks for item attacking

* makes staminacrit automatically disable combat mode, it's now impossible to enter combat mode while in stamcrit

* adds stamina buffer, halves the time needed to stand up after resting, increases stam penalty for firing weapons, and more

* tweaks stamina buffer drain rate a little

* makes buffered staminaloss redirect stamina to the actual stamloss proc when empty, makes stamina buffer stat() more precise

* removes stamina modifier for clickdelays, makes stunbatons deal extra staminaloss

* makes electrodes deal a lil extra staminaloss

* drones cannot resist a rest, so now only carbons are forced to rest

* restricts aiming down sights to carbon mobs, adds stamina display to stat()

* makes gun accuracy and stamcosts more flexible, decreases base inaccuracy penalty, makes borgs immune to inaccuracy penalties

* nerfs inaccuracy penalties just a lil more, fixes blooddrunk miner eye depleting all your stamina

* getting used to tortoisegit

* readds temp dogborg buff

* stamina and stamina buffer HUD displays. Stamina sprite from hippiestation

* makes afterattack call properly again

* decreases stamina buffer regen time to 3 seconds

* Yknow what? decreases it to 2 seconds. That's 3 entire attacks worth of waiting

* makes stamina buffer influence movespeed a lil

* nerfs compiling errors

* tweaks the icons a little

* adds autostanding, adds delimiters to attempts to stand

* makes automatic standup attempts a little clearer

* rest button now toggles intent to rest, fixes perma rest

* oop - quick fixes

* Makes crushers ignore recoil stamina on lavaland, makes burstfiring weapons deal less staminaloss

* buffs highlander sword

* makes stamina have less of an impact on the health display

* fixes dogborgs shoving other borgs into infinite stuns

* You can no longer shoot over tables or shoot through windows while resting. Also buffs turrets
2018-03-11 13:32:44 -07:00
Poojawa
6341456b76 elf ear prep, sabresune tweaks. 2018-03-11 08:52:05 -05:00
Poojawa
dfbe82a33b added a 'head' snout for Guilmons
and a datashark marking
2018-03-11 08:37:21 -05:00
Poojawa
89b520943d copypasta fail 2018-03-11 07:47:44 -05:00
Poojawa
c7b7c3d934 possibly fixes people without tails being told to *wag 2018-03-11 07:40:49 -05:00
Poojawa
76d000279e Clears out un-needed additional species.
Someone should make the guilmon snout a thing
2018-03-11 07:40:28 -05:00
Poojawa
fdeff0ed39 Ckey locks work! HOORAY! 2018-03-11 07:39:38 -05:00
Poojawa
51200f4739 reee 2018-03-11 04:52:07 -05:00
CitadelStationBot
aa7b9f192f [MIRROR] harmful var for guns (#5879)
* harmful var for guns (#36265)

* harmful var for guns

support for pacifism to use non-harmful guns

* fixes bad spacing

oops

* harmful var for guns
2018-03-10 07:57:57 -06:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
LetterJay
2f2aed48e4 Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051
[MIRROR] The ARM is now harder to obtain
2018-03-09 04:53:23 -06:00
LetterJay
0e2531faaf Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106
[MIRROR] To go even further byond... the above lighting layer!
2018-03-09 04:52:32 -06:00
Robustin
e9d3af6e61 The ARM is now harder to obtain (#36051)
* Added ARM difficulty

* Working edition Pt1

* Actually working Pt2

* Appropriate null check?

* Update narsie.dm
2018-03-09 02:17:46 -06:00
astralloop
e8548b392b To go even further byond... the above lighting layer! (#36106)
* This, is my normal form.

* THIS, IS A SUPER SAIYAN ASCENDED.

I CALL IT A SUPER SAIYAN 2

* Update lighting.dm

* Spelling correction (#3)

* Update layers.dm

* Update chunk.dm

* TO GO BYOND....

* Update lighting.dm
2018-03-08 22:43:23 -06:00
vuonojenmustaturska
8c87527005 Minor say code cleanup 2018-03-08 22:43:15 -06:00
deathride58
0f0ab49648 Update species.dm 2018-03-08 01:03:56 -05:00
deathride58
56845788ac Merge pull request #5817 from Zna12/Filet-o-fish
Filet-O-Sharkpeople
2018-03-08 05:59:01 +00:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
vuonojenmustaturska
5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-07 16:04:14 -06:00
Zna12
0941433022 Merge branch 'master' into Filet-o-fish 2018-03-07 10:41:09 -06:00
Poojawa
013c908ebf Update robot.dm 2018-03-06 23:39:06 -06:00
Poojawa
3c1e557302 compile issues 2018-03-06 22:35:16 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
CitadelStationBot
d95be2e261 [MIRROR] Allows admins to spawn mob-like objects for shenanigans (#5825)
* Allows admins to spawn mob-like objects for shenanigans (#36153)

This is basically extracting the functionality of the animation spell into an admin verb.

Please excuse the browser.dm code, this is more of a stepping stone towards the more complicated popup needed for custom ERTs.

cl Naksu
admin: Admins can now easily spawn mobs that look like objects. Googly eyes optional!
/cl

* Allows admins to spawn mob-like objects for shenanigans
2018-03-06 04:04:12 -06:00
Poojawa
6e5131cfc5 Vore code to json and more (#5789)
* Vore 2.0

Initial commit

* double checked porting

* Fixes compile issues

* converts Ash Drake bellies to new system

digs out lingering datum/belly stuff too

* Let's just work on this later

* System operational

* Update preferences.dm
2018-03-06 03:59:31 -06:00
Zna12
954ba91c07 Fucking furries reeeeeeeeeeeeeeeeee 2018-03-05 17:03:33 -06:00
Zna12
d7f3942129 Revert "Modularize modularize modularize"
This reverts commit 8a86cbd307.
2018-03-05 16:55:00 -06:00
Zna12
8a86cbd307 Modularize modularize modularize
Quaaaaaaaaack.
2018-03-05 16:52:25 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00