Commit Graph

108 Commits

Author SHA1 Message Date
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
bf26599ac3 Merge pull request #6512 from Citadel-Station-13/upstream-merge-37391
[MIRROR] Improves messaging for blood contracts
2018-04-27 09:32:21 +00:00
deathride58
e33dc09b83 Merge pull request #6495 from Citadel-Station-13/upstream-merge-37308
[MIRROR] Desc fix
2018-04-27 09:27:58 +00:00
Dax Dupont
4504014303 Improves messaging for blood contracts (#37391) 2018-04-25 05:58:58 -05:00
Jalleo
ac8b645461 Desc fix (#37308)
* Removes a unused helper

* Fixes a description so people stop getting confused with certain mining upgrades.

* Updates to say research console.

* missed a dot.

* My bad.
2018-04-23 09:20:15 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
TheDreamweaver
49a772b6b7 Fixes dupe and runtime issues with Rod of Asclepius (#36410)
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
2018-03-17 08:22:38 -05:00
CitadelStationBot
e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
2018-03-10 07:43:42 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
Buggy123
3350d145f8 Makes blood rage more clear (#36095)
* Makes blood rage more clear

* Makes blood contract more clear

* Fixes minor span class error.
2018-03-04 17:33:44 -06:00
LetterJay
d2607c0654 Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639
[MIRROR] Refactors anti-magic into a component
2018-02-25 16:59:38 -06:00
Ashe Higgs
a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-25 14:50:29 -06:00
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
fludd12
0d03e90e9f Fixes mushroom bowls (#35740)
* Fixes mushroom bowls

Made the mushroom bowl a subtype of the normal bowl, and deleted a
duplicate definition.

Also, adds custom soup and salad support for the mushroom bowls.

Fixes #32471

* Remove a dangling return
2018-02-19 22:08:09 -06:00
YPO
e3e65a5237 Fixes blood contracts being unusable if the popup is cancelled 2018-02-12 23:42:19 -06:00
MoreRobustThanYou
9c957f5a0b Heart Disease 2: Electric Boogaloo (#35296)
* Heart Disease 2: Electric Boogaloo

* Upd8
2018-02-08 03:02:29 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58
c7d3dd7e41 Merge pull request #4888 from Citadel-Station-13/upstream-merge-34322
[MIRROR] Removes ash flora being harvested on roundstart
2018-01-17 20:11:36 +00:00
oranges
ebdb8b1e16 Merge pull request #34322 from coiax/no-longer-harvested
Removes ash flora being harvested on roundstart
2018-01-16 14:36:13 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-16 14:31:02 -06:00
deathride58
cffbbbbbd1 mapping to mining, preparing for mob folder 2018-01-04 00:55:01 -05:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
coiax
9d59e36289 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 10:32:03 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Tad Hardesty
5560a557e7 Refactor ladders so that they actually work (#32797) 2017-11-20 02:05:52 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
Firecage
25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
Jordan Brown
3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842)
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
2017-09-17 22:35:51 -05:00
CitadelStationBot
9b08d9d5c9 [MIRROR] Fixes the magic ladder (#2843)
* Fixes the magic ladder

* Update necropolis_chests.dm
2017-09-17 22:16:04 -05:00