Commit Graph

6744 Commits

Author SHA1 Message Date
Leo 2851bf2c06 Merge pull request #33328 from octareenroon91/patch-55
Fix supermatter tongs icon bug
2017-12-07 10:21:54 -02:00
Jordan Brown 9460277ca0 Merge pull request #33316 from ShizCalev/games-vendor
Adds games vendor resupply crate
2017-12-06 23:52:30 -05:00
Ashe Higgs 32c68a60bf Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (#32935)
* Adds the Eminence

* New abilities and a command system

* More stuff

* I did something in this commit but I dunno what

* Beginning work on trap setups

* This is good for now until arm gets his sprites

* I did something here!

* Manacle sprites

* R.I.P. R&D

* Maintainer review

* QoL, slabbin' it up

* Conflicts

* Conflicts

* <

* Now it compiles!

* TGUI

* TGUI, again

* 🥝

* that should be all, but I'll do some quick testing...

* aha!
2017-12-07 11:36:26 +13:00
XDTM 550d71167e Brain Traumas (#31727)
* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances
2017-12-06 13:04:17 -05:00
ShizCalev 57f636b24b Adds games vendor resupply crate 2017-12-06 05:54:19 -05:00
octareenroon91 b1bc604075 Fix supermatter tongs icon bug
Fixes #33161
2017-12-06 00:36:25 -06:00
Jordan Brown 3aba012d67 Removes ComponentActivated in favor of callbacks (#33274)
* Removes ComponentActivated

* Removes a bit of proc call overhead

* Fix callback definition
2017-12-05 15:41:56 -06:00
Leo 2655d42770 Merge pull request #33262 from AutomaticFrenzy/patch/uplink-implant
Fix uplink implants not working
2017-12-05 19:39:16 -02:00
oranges bf9f81bf7e Merge pull request #32751 from ninjanomnom/keybindings
In-code key handling system, Take 2
2017-12-05 22:15:13 +13:00
oranges bd954fe780 Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 20:42:25 +13:00
kevinz000 1acc43c034 No screaming if you don't get shocked or are insulated. 2017-12-04 16:04:54 -08:00
Jordan Brown 290d00c8a6 Restores the uplink modules, removes LoadComponents 2017-12-04 11:33:18 -05:00
kevinz000 b6c53d9693 Adds a bit of medical realism to defibs 2017-12-04 03:49:05 -08:00
Tad Hardesty 48c8a87144 Fix uplink implants not working 2017-12-04 03:09:56 -08:00
Jordan Brown 3fa5acfdf4 People jitter when revived by defibs 2017-12-03 20:19:37 -06:00
kevinz000 5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
Tad Hardesty c6da68ab62 Measure energy values in joules 2017-12-02 16:05:31 -08:00
Leo 80aad8cef0 Merge pull request #33165 from MrStonedOne/revert-33062-ore_stacking
Revert "Ore Stacking"
2017-12-02 18:00:45 -02:00
CosmicScientist 502905f7ac Plushie relationships! (#33184)
* Kor and Bubblegum, sitting in a tree

* complying with oranges' review

* remove the, moves mood setting to make_young, dots Ts, crosses eyes
2017-12-03 00:48:59 +13:00
Leo 4bdcebef99 Merge pull request #33180 from praisenarsie/patch-13
cardboard no longer can damage you
2017-12-01 21:56:45 -02:00
Robustin 5cb01b39d3 Ratvar will now bitchslap BOH babies (#33159)
* Singuloproofing Reebe

* Message reformatted

* Inconsistent Indentification

* user is now living so we can knock them down
2017-12-01 12:57:54 -05:00
ninjanomnom 7b7b67edd8 In-code key handling system 2017-11-30 07:40:27 -05:00
FrozenGuy5 17d64981bc cardboard no longer can damage you 2017-11-29 20:18:49 +00:00
AnturK 3ac9d24cb0 Nuke Op Datumization (#32680)
* Nuke Op datumization.

* Whoops

* Fixes use_tag for nukes. Only syndiebomb uses one.

* Fixing rebase stuff

* How many times

* Cleanup
2017-11-29 13:52:58 -05:00
Kyle Spier-Swenson 8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000 8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00
ShizCalev 49c92ada07 Fixes twohanded weapons showing outdated icons (#33127) 2017-11-28 20:03:28 -05:00
ACCount 81fb344c75 Removes mass-spectrometers (#32965) 2017-11-28 10:19:08 -02:00
ACCount f086eab113 Removes "machine prototypes" (#33134) 2017-11-28 03:41:09 -05:00
Leo 96b8d80063 Merge pull request #33099 from jughu/Powercreep-till-the-end
Allows toolbelts to carry geiger counters
2017-11-27 12:19:28 -02:00
uraniummeltdown 16de0ac52a Stack Recipe Lists (#33081)
* ports baycode stack_recipe_list
comfy and office chairs use stack recipe lists

* removed some src. and made list_recipes() into interact()

* /datum/browser for stack menus

* revert unnecessary edit
2017-11-27 13:16:34 +01:00
ShizCalev 395c0ee6a0 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:12 -06:00
ACCount 0d2955e554 More integrated circuit fixes and code improvements (#33034)
* More integrated circuit fixes and code improvements

* Rewrites thrower component code, adds a helper for future conversion to component datums

* Fixes a mislabeled input

* minor tweaks

* Renames components list

* Changes adj check in thrower

* Fixes tools metal cost
2017-11-26 11:56:47 +01:00
jughu ad428a5679 Adds geigee counter 2017-11-26 11:44:23 +01:00
Dorsisdwarf ae9ba7bde5 Advanced Laserpointer Feline Interaction (#32940)
* nerfs laserpointers, adds cat interaction

* typo'd

* fixes is_helpers

* look at you, coder. panting and typoing as you code through my halls

* addresses minor notes, adds iscatperson to purrbation

* Replaces ON_PURRBATION define, changes to logging in laserpointer.dm

* true

* I forgot that its TRUE not true rest the fuck in peace

* Final tweaks

* Removes Stray else
2017-11-24 18:56:11 -05:00
oranges 73b25d7ef2 Refactor on_reagent_change to pass through the change type (#32805)
this is purely so the smoke circuit can reset the notification only when
reagents are actually added to it
2017-11-24 12:45:44 +01:00
Tad Hardesty 54630b7c48 Remove NODROP from water tank misters (#32995) 2017-11-24 06:05:30 -05:00
ShizCalev f912b6eae0 Fixes Lord Singuloth hungering for more than he should (#33025) 2017-11-24 05:45:47 -05:00
Emmett Gaines 7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ACCount 4c909b5ade Replaces "console screen" stock part with glass sheets (#33018)
* Removes console screen

* Map updates

* Removes console screen part sprite
2017-11-23 18:53:18 -06:00
ninjanomnom 2817a1737b defines math 2017-11-22 17:36:58 -05:00
oranges 92632ecd76 Merge pull request #32914 from kevinz000/NTNet
[READY]NTnet refactor, assimilates exonet
2017-11-23 10:52:44 +13:00
oranges ccd4981fe5 Merge pull request #32624 from kevinz000/component_uplinks
[READY]Refactors uplinks to a component!
2017-11-23 10:16:16 +13:00
ShizCalev b0f24a892b Fixes bartender suit having an adjust state (#32968) 2017-11-22 13:40:11 -05:00
kevinz000 00966e2aaa NTnet refactor, assimilates exonet 2017-11-21 20:50:45 -08:00
ACCount b161b18599 Integrated circuit fixes and code improvements (#32773)
* Fucking conflicts

* Small code changes

* Makes the IC printer start upgraded to offset balance concerns caused by a fixed bug
2017-11-21 10:04:09 +01:00
Jordan Brown b7a9a2a452 Merge pull request #32844 from ShizCalev/code-cleanup
Cleans up unused code
2017-11-20 11:13:56 -05:00
Jordan Brown de7a093ea2 Merge pull request #32905 from vuonojenmustaturska/aispawner
Adds AI lawset spawners (mapping helpers)
2017-11-20 11:11:11 -05:00
Anonmare 4f319c6d32 Buffs laserpointers (#32906)
[Changelogs]: Catpeople can now be incapacitated by laser pointers

🆑
balance: Laserpoitners now incapcitate catpeople
/🆑

[why]: Nerfs Kevinz
2017-11-20 23:11:07 +13:00
ShizCalev 02abe5d92f Makes drinking glasses smash when thrown (#32890)
* Makes drinking glasses smash when thrown

* Maintains bartender snowflake behavior

* Extended to all bottles, cartons, cleaned up 1 & 0

* Corrected breaking bottles on heads.

* Reduced glass spawn chance to 33%
2017-11-20 09:45:08 +01:00