Commit Graph
367 Commits
Author SHA1 Message Date
Poojawa f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Poojawa 8862d63d0c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-15 14:37:14 -05:00
deathride58andGitHub a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
Poojawa 5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
Poojawa fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa 4dcbaa8c80 Refractors simple mob vore code, enables vore mobs
also just removes the mistake that was hunger sounds.
2019-04-11 11:15:25 -05:00
Poojawa 45b8889562 Devourable mobs are digestible again 2019-04-11 07:13:19 -05:00
Poojawa 03a174d21f compile fixes except we're memes still
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
Poojawa ae02f091ff Dragon fixes, UI fixes 2019-03-22 15:06:36 -05:00
Trilbyspacecloneandkevinz000 b8043dc807 [Ready] Buffs Cayenne the carp (#7956)
* buffs Cayenne the carp

* woops >_<
2019-01-27 00:34:56 -08:00
Trilbyspacecloneandkevinz000 c9c8207c6c Makes Bubble Gum a male - Requested by LeglessLizard (#7820)
* Makes Bubble Gum a male

* var*

* >uses a unused var
2018-12-13 11:49:39 -08:00
Tupinambis 338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
Tupinambis bfe8fda260 Makes hivebots more robust. Makes oldstation not have an excessive amount of hivebots. 2018-11-15 20:25:06 -06:00
Trilbyspacecloneandkevinz000 e37ccab514 Legit power creep (#7676) 2018-10-30 19:28:25 -07:00
deathride58andkevinz000 db7bbfc714 super turbo lavaland 2 tournament edition (Buffs a bunch of lavaland mobs by increasing their speed) (#7550)
* super turbo lavaland 2 tournament edition

* Nerfs bubblegum by decreasing his base movement speed to the original value and nerfing the max movement speed from once per 2 ticks to once per 3 ticks

* Nerfs goliaths by reducing their damage, decreasing their vision range, and increasing their ranged cooldown time

* mass vision range reduction

* slows goliaths down a tad bit
2018-10-03 20:45:44 -07:00
nik707andkevinz000 595d4c3504 Alternative Miner Suits (#7611)
* haha what the fuck this took like a solid 6 hours

* allows new suits to spawn on legion corpses.

* Update flags.dm

* Fix conflict maybe

* pls work

* im a big gay
2018-10-03 20:32:25 -07:00
Poojawa 6d5c5dbcb0 nerfs ash drake swallow time
hopefully fixes telescopic nomming as well.
2018-09-22 14:29:28 -05:00
Poojawa d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa 01a7624ec2 fixes mam tail wag
fixes digi leg spawning
fixes ash drake range nomming
fixes spawner in alien nest
2018-09-20 01:56:46 -05:00
Poojawa cb342866d6 a few last minute changes from TG
also changes His Grace from 25 to 10 requirments
2018-09-18 23:12:29 -05:00
Poojawa cad43a6421 Fixes Drake vore, sound Looping
Also help intent squirms work again anything else still escapes.
2018-09-16 14:13:51 -05:00
PoojawaandGitHub afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
TrilbyspacecloneandGitHub 988d5fd558 NPC Space Pirate Heath Buff 100 -> 115
For the away mission
2018-09-07 16:05:51 -04:00
deathride58andkevinz000 b34b53193f tgstation/tgstation#39287 - Makes rapid fire mobs more configurable (#7549) 2018-09-07 07:24:39 -07:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58andkevinz000 f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
AnturKandletterjay dd8461d0a0 Fixes animals trying to break map border (#38929) 2018-07-06 11:39:34 -05:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJayandGitHub 2665d0e7a9 Merge branch 'master' into upstream-merge-38661 2018-06-24 18:13:53 -05:00
Jordan Brownandletterjay 20cb09cb1c Fixes bubblegum comments 2018-06-24 05:17:22 -05:00
KorPhaeronandletterjay fa06a729a2 Bubblegum is scarier again (#38306)
Miners are able to kill him roundstart by just walking backwards while shooting. Weaker than an ash drake.

Easiest way to change this was to give him his original attacks back which required you to avoid/manage blood.
2018-06-21 18:56:28 -05:00
81Dentonandletterjay e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509)
* makes caravan ambush more challenging

* SMASH
2018-06-16 15:38:34 -05:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Jordan Brownandletterjay b89dcd7e23 Merge pull request #38026 from AutomaticFrenzy/patch/frostoil
Fix frost spiders injecting a nonexistent reagent
2018-05-25 10:48:09 -05:00
LetterJayandGitHub e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
[MIRROR] Makes more messages pronoun sensitive
2018-05-23 07:46:26 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJayandGitHub 6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
YPOQandletterjay a7b5415a19 Fixes wumborian fugu dead sprite (#37832) 2018-05-14 18:55:54 -05:00
YPOQandletterjay afe80d808b Fixes gorillas not having hand slots (#37762) 2018-05-10 20:52:38 -05:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
vuonojenmustaturskaandCitadelStationBot 0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
ShizCalevandCitadelStationBot 3160d7771d Removed /obj/item/asteroid path (#37500)
* Cleans up some item paths

* removed kebab
2018-04-30 04:57:09 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00