Commit Graph

28886 Commits

Author SHA1 Message Date
AnturK 652071d9c8 bluh 2019-06-06 21:48:02 +02:00
AnturK 116ea6c71f Adds sdql2 trait wrappers. 2019-06-06 21:46:05 +02:00
nemvar 3e2f4326ea Baby grublunch for ma and pap gutlunch. (#44315)
* Alright this time for realsies

* It wasn't on my mind.

* Mind if I do?

* Facticious

* Don't mind this
2019-06-06 11:29:23 -04:00
Rowelll e68b9ab43d Adds bee socks (#44331)
* some changes your parents don't want to see

* bee

* (wrong branch)
2019-06-06 15:13:07 +02:00
oranges 4978a608f3 Merge pull request #44339 from nemvar/charcoal
Fixes charcoal
2019-06-06 22:16:56 +12:00
oranges 405205843f Merge pull request #44279 from ExcessiveUseOfCobblestone/breathe-into-me
Turns Perf into The Standard Oxychem, Heavily Tweaks Perf To Fit My Freshly Repackaged Fantasy
2019-06-06 22:15:54 +12:00
oranges 6aedfcda5f Merge pull request #44262 from actioninja/fucktheantimatter
Removes the antimatter engine
2019-06-06 22:13:13 +12:00
oranges 03d492da4f Merge pull request #44254 from actioninja/waddledefault
Clown shoes now make you waddle by default.
2019-06-06 22:12:18 +12:00
Tlaltecuhtli dab6944369 adds bamboo and fixes sugarcane (#44192)
* 1

* 2

* oh fuck

* kjhgfdfghj
2019-06-06 22:06:47 +12:00
moo 97feccb06d Reconstruction of Reconstruction Surgery (#44088)
* beep

* fixes my mental lapse of trying to logic

* im not sure what sybtypes is

* Automation/Lowered Adv Surgery Node

* Update medical_designs.dm

* old var not needed

* Update code/modules/research/designs/medical_designs.dm
2019-06-06 22:01:16 +12:00
oranges 13cc2dfaf3 Merge pull request #44333 from AnturK/moreidstuff
Fixes toxins special recipe
2019-06-06 22:00:07 +12:00
YPOQ ae95e19fc0 Fixes strained muscles not doing stamina damage (#44323) 2019-06-06 05:46:30 -04:00
vuonojenmustaturska 2d74a86353 [READY] Cleans up saycode by removing random hook stubs and using a signal where relevant (#44320)
About The Pull Request

This PR removes speech message and span hooks from dna, mutations, pierrot throat disease, species, tongues, masks, hats, held items, brain traumas and a carbon proc overload handling tonguelessness.

Tonguelessness is now handled by tongue removal registering for the speech signal and the hook being deregistered by having a tongue put in.

Also cleans up some /atom/movable/proc/get_spans() overloads that called the empty parent or overloaded the parent to do the exact same thing as the parent proc did.

Also cleans up calls to radio.talk_into() where the caller would often, as a result of copypasta, provide the proc with fresh copies of the proc's default values for proc args, and makes say_quote() better by giving it a default spans value so that none of the callers have to provide the same default one.
Why It's Good For The Game
Changelog

cl Naksu
code: Cleaned up saycode
/cl

* start with this

* oh man this looks so good

* hats are dead

* /obj/item/proc/speechModification is dead

* brain traumas and get_held_item_speechspans() are dead

* these should be static

* unfortunately we still need this

* /mob/living/carbon/treat_message(message) is kill

* clean up get_spans()

* dunk get_spans, modifies_speech for brain traumas, some superfluous static stuff

* move stuff around

* return values
2019-06-06 18:35:06 +12:00
moo 24790954cc Fix bags allowing invalid insertion of items into vendors (#44301) 2019-06-05 20:58:05 -07:00
AnturK 49924be8cb Fixes refund problems with nukeop uplink. 2019-06-05 22:12:27 +02:00
nemvar c3cfa1021a Lol 2019-06-05 20:23:18 +02:00
AnturK cab74f9fac Fixes rnd icons / biogen designs (#44292) 2019-06-05 13:24:12 -04:00
BeloneX 5988b685ab Nerfs stupid armor stats of bone bracers. (#44288)
* Nerfs Stunbatons/Stunprods

Halfes stun duration of batons/prods

* Update stunbaton.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update stunbaton.dm
2019-06-05 09:53:39 -04:00
AnturK f7421de9f1 Fixes toxins special recipe 2019-06-05 13:47:20 +02:00
oranges 2e5a3c2226 Merge pull request #44319 from actioninja/gaybabyjail
Fixes an issue with the anti-antag rolling system where players were getting banished to nullspace
2019-06-05 18:45:22 +12:00
zxaber fbc76852d0 Replaces borg hat whitelist with a blacklist, making most hats wearable by borgs (#44203)
* HATS

HATS

* fixes a pretty bad oversight

* AppVeyor pls

* update
2019-06-05 02:44:20 -04:00
Garen Crownguard 3a562c3e9c No more cross map punches (#44305)
* *me no longer a valid warcry

* whoops
2019-06-05 02:41:38 -04:00
WJohn cc4c330c4a Changes dogs to neutral faction. (#44295) 2019-06-05 02:40:11 -04:00
actioninja c6193255f7 renames the func to make it clearer it has extra logic in it 2019-06-04 19:41:41 -07:00
TheChosenEvilOne a66126d7e3 Add map voting (#44244)
- Add map voting
- Rename config option for preferred map weighted map selection
2019-06-04 23:55:14 +02:00
actioninja 0bdeb6c070 fixes gay baby jail 2019-06-04 14:12:02 -07:00
Razharas c55145299a Componentizes menucrafting (#44221)
Fixes menucrafting opening a new window when finishing construction
2019-06-04 17:01:45 -04:00
nemvar 12f7b1a5c4 Slimes now 'metabolize' reagents over time (#44268)
* Update life.dm

* Update life.dm

* Update life.dm
2019-06-04 12:18:17 -04:00
Nalzul 47700b8679 Allows you to wear the caution sign + new sprite for the caution sign (#44289)
* +Sprite +Repath

* Adds 5 brute armor
2019-06-04 11:48:47 -04:00
Emmett Gaines c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
Garen Crownguard caa683e5b1 merge 2019-06-04 07:04:21 -05:00
Garen Crownguard 4b2fc4cc05 Removes Hygiene 2019-06-04 06:25:51 -05:00
ShizCalev 30fd6ddeac Merge pull request #44280 from kingofkosmos/spanendingfixes
Adds missing </span>'s.
2019-06-04 05:50:50 -04:00
ShizCalev 84359ac37d Merge pull request #44284 from AnturK/uselesscode
Removes pointless code in antag datum
2019-06-04 05:50:00 -04:00
4dplanner ecf7d620a2 More sleep changes (#44278) 2019-06-03 22:39:40 -04:00
AffectedArc07 3a3fa4f84a Stockings (#44274)
cl AffectedArc07 and Shazbot
imageadd: Added 9 new sock styles
/cl
2019-06-04 09:55:00 +12:00
AnturK 9b15fe90aa Fix bad indent (#44285) 2019-06-03 13:25:36 -07:00
AnturK 1aabc18b60 Removes pointless misleading code. 2019-06-03 10:01:07 +02:00
moo c7df1a90b6 Merge branch 'master' into breathe-into-me 2019-06-02 20:26:53 -04:00
vuonojenmustaturska 90467b120d Adds a toolbox verb for spawning reagent containers and grenades (#44261)
Changelog

cl Naksu
admin: "Spawn reagent container" verb has been added to the Debug tab. It can be used to spawn reagent containers and grenades with fully customized contents.
/cl
2019-06-03 12:08:49 +12:00
ExcessiveUseOfCobblestone 5a745585c5 Unstale 2019-06-02 20:02:09 -04:00
4dplanner 15825997b8 Stamina changes [TMC] (#43966)
About The Pull Request

Stamina damage no longer stacks with regular damage.
Stamina regen is paused for 10 seconds every time you take stamina damage
Stamina damage is purged if stamina regen resumes after you enter stamcrit

changes to make this work:
disablers knocked down to 30
punch damage changed to full raw, 1.5x stamina.
flesh-eating symptom deals 2x stamina damage
CQC unchanged
Bostaff manually stacks
Energised jelly blob deals full stamina damage
Pressurised slime blob deals full stamina damage
Blood boil deals 1.5x stamina damage to servants of ratvar (why do I bother?)
Revenant blight now deals 20 stamina damage
Space carp no longer deal stamina damage, but deal 20 brute.
Enchanted bullets deal 20 brute damage
Beanbags reduced to 55 stamina damage
Rubbershot damage untouched
Ebow stamina damage increased to 60

bone hurting juice deals 7.5 stamina damage per tick, down from 15
Why It's Good For The Game

Stamina damage not stacking with regular damage is meant to make disablers less good as a weapon for all-out firefights, but remain good for arresting criminals as a sec squad.

The stamina regen pause allows for chemicals that deal stamina damage to be effective even if they don't only target one body part (as in #43924), and gets rid of the counterintuitive speedy regeneration if multiple bodyparts are damaged. It also makes stamina damage calculations more straightforward - currently 4 damage/tick to the chest is really 1, and adding 25% more damage to the chem deals 100% more damage per tick.

The stamina purge is to make stamcrit less of a confirmed win - several times as sec officer I've succumbed to poison, run out of charge, etc only for the rest of sec to arrive before the perp awakes from his 3 hour sleep. Stamina damage is fully purged to make keeping someone down require more attention, since under the current system even if they somehow get up they'll be so slow it'll be trivial to put them down again. Basically, makes handcuffs more useful again.
Changelog

cl
add: stamina damage now pauses natural stamina regen for 10 seconds
add: stamina regenerates fully when it can.
balance: disabler damage reduced
tweak: stamina damage no longer stacks with normal damage for the purposes of damage slowdown and crit
balance: many sources of stamina damage have been adjusted, check PR for details
/cl
2019-06-03 11:16:56 +12:00
Rob Bailey 0d86efdb52 Widescreen toggle support (doesn't actually enable it) (#43754)
cl
add: Added support for a widescreen toggle, actual widescreen will require a config change.
tweak: Auto-fit view is now the default. This will only apply to new players.
/cl
2019-06-03 11:11:09 +12:00
oranges 8eead98e84 Merge pull request #44213 from AnturK/moreadminabuse
Adds sequential mode to SDQL
2019-06-03 11:08:13 +12:00
oranges 6d9e7b778e Merge pull request #44222 from ninjanomnom/HAS_BLOOD_DNA
Replaces IF_HAS_BLOOD_DNA with HAS_BLOOD_DNA
2019-06-03 11:07:37 +12:00
oranges 7811f1ff7f Merge pull request #44208 from 4dplanner/throw
Thrown objects phase through thrower
2019-06-03 11:05:46 +12:00
Whoneedspacee 03f7432511 New RPGLoot Affixes + Component Additions (#44188)
* knockback component can now be reversed, has projectile and gun handling, and hostile simplemob handling

adds signals for hostile mobs attacking, altering projectiles before firing, and for when projectiles successfully hit their target

moves knockback handling to a general proc

adds ishelpers for guns and projectiles

* no more weird projectile handling it can just not apply the effect if the component somehow goes away

lifesteal actually works now instead of being a blank file, applies a flat healing effect when you hit something

* fixes up comsig stuff

adds new components to the fantasy prefix and suffix

knockback now handles throwing anchored objects

lifesteal now properly heals the target with projectiel weapons

adds summoning component to handle mob summoning with item attacking and such

adds fired_from variable to handle what a projectile was fired_from, firer would be the mob that fired and fired_from would be the gun, in the case of an autoturret, fired_from and firer would be the same

adds shrapnel component, fires projectiles around a fired projectile when it hits

adds igniter component to set attacked mobs on fire

* no more shrapnel on items that can't use it

summoning items now summon at least one mob maximum

adds specific weighted projectile types for shrapnel to prevent broken options being picked

removes the reverse var from knockback component and instead just handles negative thrown turf
2019-06-03 11:00:12 +12:00
kingofkosmos 1bf60bbe06 Adds missing </span>'s. 2019-06-02 21:29:14 +03:00
actioninja 1276da64f6 removes antimatter 2019-06-02 01:33:59 -07:00
oranges 089f587bbb Merge pull request #44175 from Tlaltecuhtli/patch-31
sugarcane
2019-06-02 10:35:18 +12:00