c6874eccff
Merge pull request #7569 from Tupinambis/HoSTelebaton
...
The HoS starts with a telebaton instead of a stunbaton.
2018-09-26 22:23:46 -04:00
3009e8085f
Reduces Station aquirable stamina heals ( #7593 )
2018-09-26 12:38:49 -07:00
7b4c5658e5
Merge pull request #7566 from Poojawa/action-buff
...
Buffs Action, Promotes fun
2018-09-26 15:24:58 -04:00
5f81f249ca
Merge pull request #7560 from izzyinbox/big-admin-pms
...
Changes admin-pm input type from single-line text to multi-line message
2018-09-26 15:23:36 -04:00
944de1d507
TAKE OFF THE HARDCODED BLACKLIST. STOP HAVING THE SPECIES BE CLOSED ( #7567 )
2018-09-26 12:15:17 -07:00
967a535aeb
New Reagent, Universalizes Survival Medipen ( #7570 )
...
* New Reagent, Universalizes Survival Medipen
Adds an alternate regenerative jelly for the survival medipens used in mining. Replaces the tricord and omnizine in medipens with 15u of Neo Jelly. Makes medipens finally useful for slime miners. When ODed on Neo Jelly, causes heavy brute/burn and minor oxyloss and causes no toxin damage.
* code alter
adds * to the REM.
* additional code fix
removes the M.adjustToxLoss line, and corrects code text to 52 units injected, from 57.
2018-09-26 12:07:00 -07:00
e494bbb3e3
Adds in other medical kits for miners to buy! (Nerfs brute treatment kit cost from 600 to 800 too) ( #7553 )
...
* Adds in other medical kits for miners to buy!(Buffs cost as well)
* Shit
2018-09-26 12:06:14 -07:00
5b17fbdbdb
buffs changling adrenal OD damage
...
also attempts a revive of travis without PR spam
2018-09-26 01:22:04 -05:00
6001da786c
I got it for sure this time for real. I'm sure
...
also fixes random spawns, but sorta. it might not be so great with RNG being a thing
2018-09-24 04:25:32 -05:00
e5a96114ca
Fixes exploit and a tgui issue with Hypo vials
2018-09-24 00:38:15 -05:00
69a8738fc3
Head pats won't stop tail wagging
2018-09-23 23:18:49 -05:00
3eb9501000
Does the one line fix a child wouldn't
2018-09-23 20:27:24 -05:00
6d5c5dbcb0
nerfs ash drake swallow time
...
hopefully fixes telescopic nomming as well.
2018-09-22 14:29:28 -05:00
923f12b547
hugboxes vore further
2018-09-22 04:43:49 -05:00
c6b53bb31b
update on lock status
2018-09-22 04:06:28 -05:00
12a9989a7c
runtime fixes
2018-09-22 04:06:06 -05:00
720b25c6f5
floor fixes and gun memes
2018-09-22 03:50:37 -05:00
2905299386
hotfixes to cargopods
2018-09-22 03:45:26 -05:00
3c3a01bdc0
Make these alarms initialized
2018-09-22 03:42:00 -05:00
18e08763d8
Ports my air alarm night lights
2018-09-21 23:34:00 -05:00
f03ac27664
(0,0,0,0) (0,0,0,0) (0,0,0,0) (0,0,0,0) (0,0,0,0)
2018-09-21 14:30:40 -05:00
d231018a3a
Flashy flash and Gondola Pods
...
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
c836a7e5ea
Cleans up map errors
...
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
4006dbafcb
fixes dork theme
2018-09-20 02:18:15 -05:00
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
a927920c78
Fixes excessive Midround Antag
2018-09-19 21:48:32 -05:00
42092f37c6
readds braindamage memes
2018-09-18 23:46:47 -05:00
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
7d300117af
literally everything Bhjin has been complaining about
...
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
bc0d14c193
Continual updates until merged
2018-09-17 04:55:03 -05:00
99e57fb221
various citadel tweaks/fixes
...
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
ca822954e4
Fixes Dogborg animations & huds
...
Also makes the silent check more sensible for prey loop. Re-adds borg repair balancing.
2018-09-16 16:09:53 -05:00
cad43a6421
Fixes Drake vore, sound Looping
...
Also help intent squirms work again anything else still escapes.
2018-09-16 14:13:51 -05:00
1a2460ed28
Continous update intergration until being merged
...
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
62813d4392
Fixes Preference related issues
...
Also fixes headpatting & tail checks in general
2018-09-14 03:06:21 -05:00
42db44b39e
Alien Ruin fix, various cherrypicked upstream fixes
...
Also adds new buildmode
2018-09-13 22:55:11 -05:00
6c57649625
Replaces the head of securities stun baton with telebaton.
2018-09-12 16:48:38 -05:00
9b4b5f87c4
Buffs Action, Promotes fun
2018-09-11 23:42:13 -05:00
b00a76476c
Oh hey, all of those compile fixes
2018-09-11 11:00:18 -05:00
834a94b97d
some compile fixes
2018-09-11 09:23:20 -05:00
afac3ae0ab
Merge branch 'master' into changelog-memes
2018-09-11 07:52:59 -05:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
45cb83d6b4
i forgot the most important text -> message conversion
2018-09-11 01:25:45 -05:00
dfcde0eb3c
Merge remote-tracking branch 'refs/remotes/origin/master' into changelog-memes
2018-09-10 23:51:25 -05:00
2b7af47717
Merge pull request #7557 from Trilbyspaceclone/patch-2
...
NPC Space Pirate Heath Buff 100 -> 115 (Yarr)
2018-09-10 18:56:34 -04:00
d36e683db3
Merge pull request #7547 from Citadel-Station-13/kevinz000-patch-5
...
fixes admin buildmode being unable to erase the heat of fusion reactions
2018-09-10 18:53:58 -04:00
997cb75f8f
Merge pull request #7542 from Citadel-Station-13/kevinz000-patch-2
...
adds prescription nvgs
2018-09-10 18:51:05 -04:00
bafac93084
Merge pull request #7538 from Trilbyspaceclone/patch-22
...
Makes a new blue space node, Bluespace Pockets!(Nerfing sci)
2018-09-10 18:50:45 -04:00
30133827cf
changes adminpm input type from text to message
2018-09-09 00:24:28 -05:00
988d5fd558
NPC Space Pirate Heath Buff 100 -> 115
...
For the away mission
2018-09-07 16:05:51 -04:00
deathride58