cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,148 Commits 73 Branches 18 Tags
2d28007c770281b89c9e8fa12edc0a8e5df7d8fe
Commit Graph

2313 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
fa232f52e6 Increase Rambler Weight (#23457) 2019-07-09 14:22:26 -03:00
Kurfursten
bd1c932c3c Merge pull request #23439 from Kharkov72/fat_chaplain 
Adds new fat religion
 2019-07-09 09:38:34 -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
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
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
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
a360bbe485 absolute unit 2019-07-06 18:56:04 -04:00
Damian
245df906d5 brainfart 2019-07-06 08:53:34 +02:00
Damian
9d86e3bb24 remove copypaste 2019-07-06 08:46: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
4c9a317301 Merge pull request #23392 from SonixApache/starscreen_crates 
starscreens now come in flatpacks
 2019-07-05 03:45:42 -05:00
Kurfursten
ba5beacb8c Merge pull request #23375 from DeityLink/20190630-CultSacCult 
Fixing sacrifice soul blade conversion
 2019-07-05 03:42:57 -05:00
boy2mantwicethefam
e30a0acf73 Brazil 2019-07-04 12:42:11 +03:00
boy2mantwicethefam
a2d8d280aa Adds intercept for 100 station threat 2019-07-04 02:43:28 +03:00
boy2mantwicethefam
040d039659 Let's give this a try 2019-07-04 01:48:12 +03:00
madmanmartian
5596140e2a Fixes nuke ops theme failing to stop, despite it not having started? 2019-07-02 23:37:51 +01:00
Kharkov72
3801f62021 aw shit, here we go again 2019-07-02 15:54:46 -04:00
Kurfursten
9fd12e3c37 Merge pull request #23187 from ShiftyRail/PlayerInvis 
Allows admins to make a player completely invisible
 2019-07-02 10:02:06 -05:00
Kurfursten
7df67d3b35 Merge pull request #23369 from Kharkov72/beep 
Airlocks now make wirecutter sounds when cut, and beep sounds when pulsed
 2019-07-02 01:12:13 -05:00
plosky1
5a89ca6a0c code (#23357) 2019-07-02 00:38:58 +02:00
SonixApache
84bae24be1 starscreens now come in flatpacks 2019-07-01 23:04:46 +02:00
DeityLink
c27253909c derp 
Co-Authored-By: DamianX <DamianX@users.noreply.github.com>
 2019-06-30 22:55:42 +02:00
DeityLink
78577d57fb fix cult sac convert 2019-06-30 18:31:05 +02:00
Kharkov72
86ccf8ec2a untested consistency THANKS BYOND 2019-06-30 11:43:18 -04:00
Kurfursten
e48f4a3ae1 Merge pull request #23286 from DeityLink/20190618-FixBloodSlash 
You can now aim at lying down mobs with a soul blade's projectiles
 2019-06-30 10:25:58 -05:00
Kurfursten
a94c58c46f Merge pull request #23290 from GlassEclipse/glasseclipse-branch9 
Fixed syndie shoes getting the ninja shoe message.
 2019-06-30 10:25:42 -05:00
Kharkov72
9f4ec40881 makes the source the door, not (You) 2019-06-29 17:13:14 -04:00
Kharkov72
5b9d1ef68e beep 2019-06-29 16:42:28 -04:00
GlassEclipse
adc18d92dd modified: code/datums/gamemode/role/cultist.dm (#23318) 2019-06-23 08:49:07 -03:00
Shifty/Anthomansland
d809ea7b45 Merge branch 'Bleeding-Edge' of https://github.com/vgstation-coders/vgstation13 into PlayerInvis 2019-06-22 12:37:30 +02:00
Shifty/Anthomansland
b4ecb2e313 Erf 2019-06-22 12:37:25 +02:00
Kurfursten
4e90d48579 Merge pull request #23238 from GlassEclipse/glasseclipse-branch2 
Blood Cult Refactor
 2019-06-19 21:35:48 -05:00
GlassEclipse
48d46b6f3c modified: code/datums/gamemode/factions/bloodcult/bloodcult.dm 2019-06-19 07:26:01 -05:00
GlassEclipse
c8b6680a87 modified: code/datums/gamemode/misc_gamemode_procs.dm 
modified:   code/datums/gamemode/role/ninja.dm
 2019-06-18 21:08:59 -05:00
DeityLink
e87ad8bdf1 fix 2019-06-18 23:14:39 +02:00
Kurfursten
199903a314 Merge pull request #23192 from ILoveYouuuu/Bleeding-Edge 
Adds an NTT Report Falsifier item
 2019-06-18 02:49:58 -05:00
dylanstrategie
02c16b1238 Fix Nuke starting issues, leader titles need fixing (#23266) 
* Fix Nuke starting issues, leader titles need fixing

* Leader title fix

* Shifty change

* More still

* Help
 2019-06-16 21:42:07 +02:00
dylanstrategie
ba3be31411 Another Nuclear Operatives rework, adding loadouts and tweaking other things (#23246) 
* Another Nuclear Operatives rework, adding loadouts and tweaking other things

* Fixes the usual minor fuck-ups

* Requested changes
 2019-06-16 08:09:45 -03:00
GlassEclipse
bcb117f2f4 modified: code/datums/gamemode/factions/bloodcult/bloodcult.dm 2019-06-14 00:52:56 -05:00
Kurfursten
25b10668b7 Merge pull request #23250 from DeityLink/201906013-SoulBladeFix 
Just fuck my shit up
 2019-06-13 16:47:33 -05:00
DeityLink
cfdc9d223b ahhh 2019-06-13 21:39:06 +02:00
DeityLink
31e6a8af39 eh 2019-06-13 21:30:38 +02:00
Paul Ritter
cee027c70b allows badmins to be midround badmins once again (#23245) 2019-06-13 15:08:38 +02:00
GlassEclipse
a6ed0d5331 modified: code/datums/gamemode/factions/bloodcult/bloodcult_spells.dm 2019-06-13 00:19:30 -05:00
GlassEclipse
88e1e03a47 modified: code/datums/gamemode/factions/bloodcult/bloodcult_data.dm 2019-06-13 00:17:19 -05:00
GlassEclipse
d0c4faa477 modified: code/datums/gamemode/factions/bloodcult/bloodcult.dm 
new file:   code/datums/gamemode/factions/bloodcult/bloodcult_data.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_runes.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_runespells.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_spells.dm
	deleted:    code/datums/gamemode/factions/bloodcult/bloodcult_words.dm
	modified:   code/datums/gamemode/role/cultist.dm
	modified:   code/modules/mob/living/silicon/ai/login.dm
	modified:   code/modules/mob/living/silicon/silicon.dm
	modified:   code/world.dm
	modified:   vgstation13.dme
 2019-06-12 23:58:52 -05:00