Commit Graph

29971 Commits

Author SHA1 Message Date
DeityLink
2d28007c77 Virology Rewrite/Virus3/Nu-viro: IT'S FINALLY HERE (#23461)
* Virology Rewrite/Virus3 - Part 2.5 of 3 : Rebase to Bleeding-Edge (#23391)

* Virology Rewrite/Virus3 - Part 1 of 3 : pathogen spread, science goggles (#22036)

* blud

* cloud

* clooooud

* spread

* scanner

* I am the god of hellfire

* oh god oh no

* trimming fat

* dsqdsqdqs

* sdqdqsdqs

* derp

* pinky & the brain

* gibs n meats

* fix

* FeetStab

* working

* overload

* recipes

* analyser sprites

* analyser

* fucktheflu

* cures

* scanner

* scanner data

* work

* incubator

* more incubator stuff

* all of the centrifuge

* some splicer stuff

* more stuff

* lab mouse and cage

* way too much shit

* rr

* duh

* travis u havin a stroke?

* dangerousness

* better spacing

* some fixes

* qdel

* virus and immune system transfer

* derp

* pixels

* fixing retardation

* srccccccccc

* geh

* ahh

* sterility scan

* however

* out of

* conflicted dmi fixes

* what's wrong with you git

* aight travis now get your shit together.

* ffff

* hurr durr

* setting up

* oh shit nigga why have I not commit any of this yet

* ugh

* curb your pathogens

* bleh

* eh

* runtime

* sterilizine buff

* fixes

* sterile

* fixes

* gibbbb

* gneh

* eh

* oh that too

* fixing mouse refactor

* lab mice packs

* oh god oh fuck here we go

* fucking pandemic circuitboard

* chew

* ERT

* step on it travis

* get on with it

* fixing disease touch not really though

* what's your problem byond

* o minus

* syntax error

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* spelling error

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* still that spelling error

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* boy am I bad at english

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* I mean just look at that

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* manual tweak and record

* oxford comma or something

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* TRAsen

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* wrong proc

* weird process

* chem chem chem

* mouse balance

* defines
2019-07-09 21:01:45 +02:00
Kurfursten
2bcc770048 Mining Support Patch (#23441) 2019-07-09 14:25:05 -03:00
Kurfursten
fa232f52e6 Increase Rambler Weight (#23457) 2019-07-09 14:22:26 -03:00
boy2mantwicethefam
104d9e2ba7 Oops (#23466) 2019-07-09 13:45:37 -03:00
Kurfursten
bd1c932c3c Merge pull request #23439 from Kharkov72/fat_chaplain
Adds new fat religion
2019-07-09 09:38:34 -05:00
Paul Ritter
d191fe0bf5 WHY DID THIS NOT GET CAUGHT (#23463)
* WHY

* fixes  #23434 while im at it
2019-07-09 16:27:43 +02:00
Kharkov72
96344c41c3 corn fragrance 2019-07-09 10:03:30 -04:00
Kurfursten
5d9009e951 Merge pull request #23390 from SonixApache/banana_holster
can holster bananas, isgun macro, isbanana macro
2019-07-09 04:04:20 -05:00
Kurfursten
5f228f511b Merge pull request #23455 from SonixApache/teleport_attack
fixes ninja sword teleport item_action not being granted to the user
2019-07-08 17:36:36 -05:00
MadmanMartian
be79cdb24a Much more things check for mining difficulty now. (#23444) 2019-07-08 17:05:57 -03:00
MadmanMartian
d7be869e50 Cages can no longer catch HUGE mobs (#23446) 2019-07-08 17:05:31 -03:00
SonixApache
61ad39f2d4 line comment 2019-07-08 20:34:08 +02:00
Kurfursten
2446d44421 Merge pull request #23432 from DamianX/CheckEnemyJobs
Allow dynamic rulesets to have custom enemy job requirement checks
2019-07-08 13:13:03 -05:00
Kurfursten
095b617239 Merge pull request #23400 from DamianX/ThanksDUNG
Possible workaround for scrollbar bug that only randomly affects admins
2019-07-08 13:11:00 -05:00
Kurfursten
74a77f392f Merge pull request #23401 from DeityLink/20190702-CritPales
Pale being nerf
2019-07-08 12:53:47 -05:00
Kurfursten
a16b391a04 Merge pull request #23407 from DrSnips/detective-boxes
Detective gear.
2019-07-08 12:53:00 -05:00
Kurfursten
601242762b Merge pull request #23411 from boy2mantwicethefam/window-flashing
Your Dreamseeker window will now flash when you receive an adminhelp or when you are dead and a gamemode is looking for candidates
2019-07-08 12:48:53 -05:00
Kurfursten
0b6ee7c576 Merge pull request #23412 from boy2mantwicethefam/edge
Adds intercept for 100 station threat
2019-07-08 12:47:04 -05:00
Kurfursten
cb9cbf8deb Merge pull request #23418 from PJB3005/19-07-04-pda-close
Make PDAs not have their own custom close button.
2019-07-08 12:42:56 -05:00
Kurfursten
6280831eab Merge pull request #23421 from boy2mantwicethefam/ties
Scientists spawn with ties, adds system to attach accessories to new loadouts
2019-07-08 12:42:04 -05:00
Kurfursten
51968ad276 Merge pull request #23435 from DamianX/Freedumb
Freedom implants always have 5 uses
2019-07-08 12:39:31 -05:00
Kurfursten
4ef597c97e Merge pull request #23438 from Kharkov72/axis
Telesci Typo Fix
2019-07-08 12:38:17 -05:00
SonixApache
5401a84255 fixes ninja teleport missing 2019-07-08 19:13:11 +02:00
Kurfursten
a9332b9726 Merge pull request #23399 from Kharkov72/gult
Reduces Cult weight to 2, down from 3 - 2, electric boogaloo
2019-07-06 23:45:10 -05:00
Kharkov72
d385d97010 .. 2019-07-06 19:08:01 -04:00
Kharkov72
4e3ac5f129 Revert "4"
This reverts commit b6c47531d0.
2019-07-06 18:59:19 -04:00
Kharkov72
a360bbe485 absolute unit 2019-07-06 18:56:04 -04:00
kilozombie
cc3296ae6c Fixes infinite RUST turbine runtimes (#23430) 2019-07-06 17:53:52 -04:00
DrSnips
f2c16cbc5f Switchblades added, new det belt item list, bundle updated, box contents updated. 2019-07-06 16:35:16 -04:00
DrSnips
3646248122 Dr.S' New() groove. 2019-07-06 16:30:37 -04:00
DrSnips
691a58bb22 Added detective belts and luminol spray bottle to the detective's locker. 2019-07-06 16:30:37 -04:00
boy2mantwicethefam
d11dbce256 Throw damage should work again (#23437) 2019-07-06 22:23:13 +02:00
Kharkov72
b6c47531d0 4 2019-07-06 13:55:50 -04:00
Damian
c36e8a2874 Freedom implants always have 5 uses 2019-07-06 11:18:56 +02:00
Damian
245df906d5 brainfart 2019-07-06 08:53:34 +02:00
Damian
9d86e3bb24 remove copypaste 2019-07-06 08:46:10 +02:00
Kharkov72
66d4cd872e typo (#23427) 2019-07-05 20:30:22 -07:00
kilozombie
46d5fd3706 Allows holominimaps to be disabled cleanly on a per-map.dm basis (#23424)
* Makes disable_holominimap_generation function

* Adds disable_holominimap_generation var

* Removes unnecessary if statement

* Indendadion

I ate grayons
2019-07-05 19:30:22 -04:00
SonixApache
d082c58bf2 bluspess 2019-07-05 23:33:10 +02:00
boy2mantwicethefam
5e0954378e On-the-fly change because I fucked up merging from bleeding edge 2019-07-05 18:45:04 +03:00
Kurfursten
f5ee139a12 Merge pull request #23376 from DeityLink/20190630-CanCrusher
Can Crusher
2019-07-05 09:25:22 -05:00
DeityLink
83bc6c01d5 gah 2019-07-05 16:04:10 +02:00
Kurfursten
c034da6121 Merge pull request #22885 from boy2mantwicethefam/spells
Splits spellbook spells into Offensive, Defensive, Utility, and Miscellaneous, adds framework for passive spells.
2019-07-05 08:40:25 -05:00
DeityLink
efcb37613d better 2019-07-05 15:37:09 +02:00
DeityLink
350be17e12 for good measure 2019-07-05 15:37:09 +02:00
DeityLink
470a836eb5 crushed 2019-07-05 15:37:09 +02:00
DeityLink
6edf9efbec hyuck hyuck hyuck 2019-07-05 15:37:09 +02:00
DeityLink
f9ab48c55c can crusher 2019-07-05 15:37:08 +02:00
boy2mantwicethefam
90103b590a Ties 2019-07-05 15:41:10 +03:00
Kurfursten
4c9a317301 Merge pull request #23392 from SonixApache/starscreen_crates
starscreens now come in flatpacks
2019-07-05 03:45:42 -05:00