Commit Graph

7422 Commits

Author SHA1 Message Date
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
kevinz000
938ad42735 Merge pull request #11636 from Trilbyspaceclone/patch-325
Medical Mechs syringe gun now innately know more healing chems
2020-03-28 15:58:14 -07:00
Putnam3145
8a620b0ebc More dynamic rework: help I wasn't done (#11642)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-28 14:46:37 +01:00
kevinz000
eb84d426e1 Merge pull request #11634 from Ghommie/Ghommie-cit645
Fixing a couple issues with sofas.
2020-03-27 21:25:31 -07:00
kevinz000
39e2ae7d1f Merge pull request #11629 from Seris02/nomoreblowingborgs
stops hijackers from being able to remotely blow up borgs (probably)
2020-03-27 21:23:54 -07:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Putnam3145
64254ed384 Merge pull request #11647 from BlackMajor/SpaceRuins
Fixes welded lockers spamming chatlogs when resisting.
2020-03-27 00:35:40 -07:00
BlackMajor
aa07bf262a lmao one line fix 2020-03-27 20:32:53 +13:00
Putnam3145
170a232d25 Merge pull request #11632 from Citadel-Station-13/Ghommie-patch-4
Chaplains are now inelegible for bloodsuckers.
2020-03-26 18:56:25 -07:00
Lin
76e4d0e0db Merge pull request #11622 from Ghommie/Ghommie-cit643
Antags such as wizard and nuke ops are now flavorless. Also closet megafauna fix.
2020-03-26 18:06:50 -05:00
Trilbyspaceclone
e368a7d8e3 Update medical_tools.dm 2020-03-26 17:21:10 -04:00
kevinz000
b32e6c3b5b Merge pull request #11607 from Ghommie/Ghommie-cit642
Adds privates visibility preferences. Also underwear now fulfills its purpose.
2020-03-26 13:24:26 -07:00
Ghom
759182ed90 Update sofa.dm 2020-03-26 21:04:58 +01:00
Ghommie
ef3106aab6 Fixing a couple issues with sofas again. 2020-03-26 19:24:56 +01:00
Trilbyspaceclone
8bd238c87c Reblances flares, flashlights and eye-lights (#11404)
* Update flashlight.dm

* makes the torch be enlightend

* Update flashlight.dm

* Update code/game/objects/items/devices/flashlight.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* >makes atmo pipes small items >makes heavy duty flashlight lightweight > muh realism

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-26 16:49:49 +01:00
Ghom
8e54cbe364 Update dynamic_rulesets_roundstart.dm 2020-03-26 15:54:38 +01:00
Ghom
75a9bc0b80 Update bloodsucker.dm 2020-03-26 15:54:02 +01:00
Seris02
17f4b0f34f I assume this works 2020-03-26 17:46:41 +08:00
Ghommie
36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01:00
kevinz000
388e6d46df Merge pull request #11603 from KathrinBailey/Kat-Furniture
Kat Shutter Balancing & Sprite Updates: COVID-19 Shut-In Edition
2020-03-25 12:22:42 -07:00
kevinz000
6464c2470a Merge pull request #11600 from Ghommie/Ghommie-cit641
Removes dead flightsuit code leftovers and bad hook.
2020-03-25 12:20:17 -07:00
kevinz000
f41e5655d8 Merge pull request #11592 from Ghommie/Ghommie-cit639
Fixing an inconsistency with nuclear bombs exploding on station level space.
2020-03-25 12:19:15 -07:00
kevinz000
cbb5d52ca1 Melee Stagger (#11443)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* wack

* animation is now shorter

* linter save me

* i hate you

* k

* k

* k

* i hate you

* wrong button

* k

* ok

* bet

* bet

* bet

* Update item_attack.dm

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

* fix

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 18:37:39 +01:00
Putnam3145
3d8084709b A dynamic rework: target threat levels (#11515)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 17:40:37 +01:00
Ghommie
f3b6b2f8e4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit642 2020-03-25 02:49:02 +01:00
Ghommie
c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
KathrinBailey
134d861fd7 KAT SHUTTERS ALL OF THE STUFF
Checked: Animations timings, the buttons in-game (they open and close), the radiation insulation (rad shutters don't block rads once open but do once closed, 0.2x multiplier to rads). Animations all play and the shutters actually open and close.
2020-03-24 20:13:48 +00:00
Timothy Teakettle
62d1a1f734 cook now gets to choose their ingredient box + sushi ingredient box (#11590)
* Update miscellaneous.dm

* Update cook.dm

* fixes some bugs

* i broke something again and now fix it

* fixes remote, edits ingredient box contents

* even more wildcard items

who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)

* removes a random newline

* adds a newline to the end of the file i accidentally removed

* why was there a newline here too
2020-03-24 20:39:46 +01:00
Ghommie
54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01:00
Trilbyspaceclone
f8147e5a85 Ports over Mortars and Pestles (#11546)
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-24 14:03:31 +01:00
Ghommie
97ad47f3fd Fixing an inconsistency with nuclear bombs exploding on station level space. 2020-03-23 22:40:02 +01:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
kevinz000
33317e20fe Merge pull request #11570 from zeroisthebiggay/contractorrandomitemspowergaming
moves sneaksuit to bundles, removes useless contractor items, adds sneaksuit to contractor pool of random items
2020-03-23 10:38:22 -07:00
kevinz000
dfec544d71 Merge pull request #11578 from Ghommie/Ghommie-cit636
Fixing owner not being set in mutation/on_aquiring.
2020-03-23 10:36:17 -07:00
keronshb
830f646383 Revert "Merge pull request #11225 from r4d6/Random-Mining"
This reverts commit ea5774e713.
2020-03-22 15:55:08 -04:00
Ghommie
3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +01:00
kevinz000
0b71b51360 Update stunbaton.dm (#11559) 2020-03-22 13:37:16 +01:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549)
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
2020-03-22 13:02:23 +01:00
Putnam3145
ab1274c832 Massive optimization for sink objective. (#11563) 2020-03-22 13:01:36 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
ZeroMan
46d80cd784 i forgot a comma 2020-03-21 20:18:44 -04:00
ZeroMan
a5f988e0be fuck me up fam 2020-03-21 19:43:43 -04:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
necromanceranne
94c700a06c NVG Nerf/Syndicate NVG Buff (#11548)
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
2020-03-21 15:31:59 +01:00
ZeroMan
93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
kevinz000
d1da7c8131 Merge pull request #11529 from Trilbyspaceclone/patch-312
Small pipes
2020-03-20 22:57:43 -07:00
kevinz000
e687c7cefc Merge pull request #11544 from Trilbyspaceclone/patch-319
New Old Ninja Steal Goals
2020-03-20 22:48:45 -07:00
kevinz000
4eaa3a22c2 fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging (#11528)
* wew

* ah

* k

* k

* faster
2020-03-21 02:45:34 +01:00
kevinz000
1bb0c01ff1 Hypereutactic blade properly slows you down again, adds set_slowdown() and hooks vv_edit_var for it (#11553)
* ok

* Update items.dm
2020-03-21 02:42:02 +01:00
necromanceranne
570f6e8a66 Plastitanium Rapier: Sleepy Edition (#11507)
* knockout rapier, improved sprites

* it's a rapier not a foil those aren't synonyms

* whoops

* needs it's shanking sound

* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!

* Update items_and_weapons.dmi

* Removes chat spam and also frankly it doesn't need drowzy on top
2020-03-20 16:07:04 +01:00