Commit Graph

4465 Commits

Author SHA1 Message Date
Putnam3145
ede3379a87 Merge pull request #11719 from Ghommie/Ghommie-cit662
Intellectual property infringment is not cool.
2020-04-02 06:18:41 -07:00
Ghommie
e50fe8b061 Removing a trademark from the game. 2020-04-02 14:48:43 +02:00
Putnam3145
736ef2cb7c Merge pull request #11705 from Ghommie/Ghommie-cit659
It's past midnight, time for your runtime errors fixing.
2020-04-01 23:16:29 -07:00
kevinz000
234dd9c439 Merge pull request #11669 from Ghommie/Ghommie-cit651
Ports "Fixes vault and high security door material exploit and tweaks high security door cost"
2020-03-31 18:00:02 -07:00
Ghommie
5bae25c889 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit659 2020-04-01 00:49:13 +02:00
Ghommie
8bb98f92ca It's past midnight, time for your runtimes flattening. 2020-04-01 00:47:29 +02:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676)
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
actioninja
abde27c098 layer changes 2020-03-28 23:50:08 -07:00
actioninja
f419653c28 functionality 2020-03-28 23:50:06 -07:00
Ghom
46e5a18bd3 Update door_assembly.dm 2020-03-29 01:03:08 +01:00
Ghommie
983d7826b6 Ports "Fixes vault and high security door material exploit and tweaks high security door cost" 2020-03-29 00:51:16 +01:00
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
eb84d426e1 Merge pull request #11634 from Ghommie/Ghommie-cit645
Fixing a couple issues with sofas.
2020-03-27 21:25:31 -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
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
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
Ghommie
36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01: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
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
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
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
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
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
ZeroMan
35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
Seris02
ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520)
* yeet gone

* pfft oof

* oof
2020-03-19 13:40:11 +01:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00