Commit Graph

61 Commits

Author SHA1 Message Date
SandPoot
b36da8f5d7 Revert "Revert "[DNM] Updates firemanning, throwing stuff""
This reverts commit def4b38a46.
2023-10-12 14:34:02 -03:00
BlueWildrose
def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
SandPoot
5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
KrissKr0ss
66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
silicons
dc88c32c77 Update inventory.dm 2022-05-15 13:53:25 -07:00
silicons
ffe0a0a9e7 Update inventory.dm 2022-05-15 13:53:07 -07:00
silicons
26f6e92e70 Update inventory.dm 2022-05-15 13:52:33 -07:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb
bf7cd77096 Fixes a few things 2021-10-13 23:25:01 -04:00
Letter N
3fa43b7f61 oops forgot this reg 2021-03-09 10:09:02 +08:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
MrJWhit
4fdacf0560 Porting putnams ventcrawling PR and Fix (#13571)
* Porting putnams rage

* And the bugfix
2020-10-17 11:39:25 +02:00
silicons
7d2d4d870c Merge pull request #13179 from Detective-Google/if-chain-begoen
kills an ugly if-chain in inventory code (probably)
2020-08-17 03:13:48 -07:00
Detective Google
9b943ec7a9 yee 2020-08-15 21:29:39 -05:00
kiwedespars
bff11c4fe5 fixes, changes.
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648)
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629)
- description fixes, eldritch amulet now works.
2020-08-13 01:12:10 -07:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
silicons
ffcfd21613 fix 2020-07-27 14:24:10 -07:00
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
kevinz000
f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
kevinz000
c551006295 catch dropped 2020-04-22 10:54:42 -07:00
kevinz000
289d581e66 ok bet 2020-03-26 12:19:09 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
2426849d4b this is a pretty bad idea 2019-10-22 02:19:33 -07:00
Ghommie
9c3e532be7 Fixes lack of arguments on mobs' can_equip. 2019-10-09 00:21:55 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
deathride58
7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
vuonojenmustaturska
003eced6af [s] Removes some stationloving-related failure surface (#37727)
COMSIG_TRY_STORAGE_TAKE fails, leaving the disk out-of-bounds. forceMove HAS to be good enough here.
2018-05-08 16:40:56 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
kevinz000
4fb2e612df Fixes bloodbath effects not working on people in crit (#36598)
Also some minor improvements to performance by caching the nearby mobs list once
2018-04-03 22:01:59 -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
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
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
Cruix
558b87ce65 Fixed instant summon behavior with simple animals (#35780)
Removed hand slots from lots of things that should not have them
2018-02-19 22:08:01 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
John Ginnane
ac1b2f76ef Fixed alt-click not working with stacks (#34396)
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
2018-01-14 22:05:07 -06:00
John Ginnane
6720fc3713 Newly crafted stacks are merged with held stacks of the same type (#33971)
* Merge newly crafted stacks with held stacks

* Update code
2018-01-07 20:28:46 -06:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
Jordan Brown
ebcacc733f Makes put_in_hands use drop_location() (#31347) 2017-10-06 21:36:57 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00