Commit Graph

10544 Commits

Author SHA1 Message Date
coiax
165d53b0de Add caltrop component for spikey floor objects (#33280)
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
2017-12-10 11:31:56 -05:00
oranges
728465e7c7 Merge pull request #33392 from vuonojenmustaturska/patch-1
[s]Ghost altclick fix for pet carriers
2017-12-10 21:53:19 +13:00
Jordan Brown
50a30a8f8a Merge pull request #33263 from kevinz000/patch-402
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
2017-12-09 16:25:38 -05:00
Jordan Brown
dff4c8a862 Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 16:22:00 -05:00
Dax Dupont
778f8570aa Prevents grilles from magically regenerating (#33357) 2017-12-08 19:24:35 +01:00
vuonojenmustaturska
e030d5dc2a Ghost altclick guard for pet carriers 2017-12-08 13:30:36 +02:00
Ashe Higgs
6e8401e112 Adds pet carriers (#33231)
* Adds pet carriers

* Some bugfixes

* praise the 1 AM code
2017-12-08 22:28:56 +13:00
kevinz000
b08c766372 Improves code 2017-12-07 17:51:34 -08:00
swindly
94f83561a8 fixes suicide acts 2017-12-07 16:27:29 -05:00
Jordan Brown
8c8eba8b94 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-07 13:50:09 -05:00
Tad Hardesty
51c7bdc007 Replace radio frequency magic numbers with defines (#33236)
* Change transmission_method to use defines rather than magic numbers

* Use MIN and MAX_FREE_FREQ defines when bounds-checking radios

* Remove violently broken "Debug Signals" verb

The relevant Destroy() is never called, making the static pointers list
take lots of memory and be large enough, even at roundstart, to crash
the chat when invoked (25k+ entries).

* Remove unnecessary checks for SSradio not existing

* Move department frequencies from GLOB to defines

* Replace all hardcoded radio frequencies with named defines

* Change the radio filters to be defines

* Use a define for the default signaler code
2017-12-07 14:58:27 +01:00
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
deathride58
3265d09328 Nerfs criticism 2017-12-06 12:46:02 -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
deathride58
1904080823 i fucked up - GLOBAL.DEFAULT_VIEW > GLOB.DEFAULT_VIEW 2017-12-05 21:53:52 -05:00
deathride58
b765f50302 makes the default view scale a config option 2017-12-05 21:44:56 -05: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
ACCount
88187f86d5 Moves some machine sprites into /machines/ folder (#33124)
* Moves biogenerator.dmi

* Separates cryogenic2.dmi into 3 sprite files

* Updates a map

* moves suit storage sprite

* Gives cameras their own file
2017-12-04 14:45:35 +01: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
Robustin
3876bdc919 Plasma statues get fixed (#33224)
* Plasma statues fix

* Actually a fix

* brackets
2017-12-03 14:15:42 -05: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
Jordan Brown
972fb937cf Merge pull request #33198 from kevinz000/patch-400
Corrects the HoS not having a spare gun fabr- I mean, departmental protolathe board.
2017-12-02 09:45:08 -05: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
vuonojenmustaturska
bae75e8459 Clean up some loc assignments (#33157) 2017-12-01 22:14:32 -02: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
BeeSting12
c63bb7a869 Fixes spelling error in opened cryogenic pods. (#33189) 2017-12-01 21:54:31 -02:00
Jordan Brown
29c0b4d490 Merge pull request #33151 from AutomaticFrenzy/patch/techwebs-ui
Vastly enhance the R&D Console UI
2017-12-01 18:36:59 -05: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
kevinz000
60db53cabe Gives HoS a lathe board 2017-12-01 03:01:37 -08:00
ninjanomnom
7b7b67edd8 In-code key handling system 2017-11-30 07:40:27 -05:00
Tad Hardesty
0fb7f2649c Remove unnecessary argument to Join 2017-11-29 14:04:19 -08: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
Tad Hardesty
23c0516c87 Fix and tidy the output of research scanner goggles 2017-11-28 17:59:42 -08:00
ShizCalev
49c92ada07 Fixes twohanded weapons showing outdated icons (#33127) 2017-11-28 20:03:28 -05:00
ShizCalev
24ca193e7e Fixes big band music crate (#33138) 2017-11-28 20:01:29 -05:00