shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,530 Commits 5 Branches 0 Tags
b4e01ac82ce85d0912528ece3760c1048f2d4838
Commit Graph

9208 Commits

Author SHA1 Message Date
deathride58
b4e01ac82c Fixes widescreen pref regression (#5822) 2018-03-05 16:12:35 -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
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814) 
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
 2018-03-05 15:20:49 -06:00
CitadelStationBot
032511a03e [MIRROR] Added a cooldown to being shown hud images (#5810) 
* Merge pull request #36144 from Cruix/hud_images_cd

Added a cooldown to being shown hud images

* Added a cooldown to being shown hud images
 2018-03-05 15:02:10 -06:00
CitadelStationBot
3569152bf8 [MIRROR] Cleans up save file update code. (#5816) 
* Cleans up save file update code.

* fixes merge issue
 2018-03-05 14:44:18 -06:00
CitadelStationBot
848b12db64 [MIRROR] [READY]Hostile mobs can attack assemblies (#5821) 
* [READY]Hostile mobs can attack assemblies (#36157)

* new fenotype

* attack

* Update items.dm

* Update assemblies.dm

* Update assemblies.dm

* Update items.dm

* [READY]Hostile mobs can attack assemblies
 2018-03-05 14:38:30 -06:00
CitadelStationBot
c72201e605 [MIRROR] Splits projectiles into different files for readability (#5800) 
* Splits projectiles into different files for readability

* Update tgstation.dme

* I love how the dme cleans itself up
 2018-03-05 14:13:08 -06:00
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788) 
* Clean up all sorts of crap, mostly defines

* fixes compile errors
 2018-03-05 13:23:28 -06:00
CitadelStationBot
892b3b4307 [MIRROR] Allows the auxbase camera console to place airlocks on fans (#5813) 
* Allows the auxbase camera console to place airlocks on fans (#35975)

* - Allows the aux base rcd to commit the same atrocities as the regular rcd
- Rids us of another value that does nothing

* first and only webeditor commit

* Allows the auxbase camera console to place airlocks on fans
 2018-03-05 13:02:08 -06:00
CitadelStationBot
c8107c52cc [MIRROR] Adjusts fire priorities of flightpacks, research, networks, and fields. (#5809) 
* Adjusts fire priorities of flightpacks, research, networks, and fields. (#36129)

* Fire priorities

* research lower not higher

* Don't need to keep timing if it's automatically compensating for missed ticks.

* Spelling

* spelling

* Adjusts fire priorities of flightpacks, research, networks, and fields.
 2018-03-05 13:01:49 -06:00
CitadelStationBot
2a161f4727 [MIRROR] Fix brains in MMIs being unable to pilot mechs (#5808) 
* Merge pull request #36128 from AutomaticFrenzy/patch/brainmech

Fix brains in MMIs being unable to pilot mechs

* Fix brains in MMIs being unable to pilot mechs
 2018-03-05 13:01:18 -06:00
CitadelStationBot
de97c9653a [MIRROR] SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD (#5792) 
* SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD

* Update fitness.dm

* fixes compile issue
 2018-03-05 12:37:40 -06:00
CitadelStationBot
5374393635 [MIRROR] Removes the devils var (#5819) 
* Merge pull request #36175 from tgstation/Cyberboss-patch-1

Removes the devils var

* Removes the devils var
 2018-03-05 12:34:28 -06:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710) 
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
 2018-03-05 12:34:01 -06:00
Cameron!
841a4199af Removes MediHound's Noncon Vore (#5738) 
* Removes MediHound's Noncon Vore

MediHound once again respects vore preferences, as intended.

To make up for this, they now receive a unique cyborg hypospray with fewer reagents, increased energy costs, and no ability to upgrade.

* Moves Preference Check to New Sleeper-Specific Variable, Buffs Hypo

Rather than using target.devourable, MediHounds now check for a new target.sleeperable preference, which defaults to TRUE.

Also, removed the custom HoundHypo. MediHounds will now get the full borg hypospray.

* Removes unnecessary 5th port code

* Breaks the patch for Bhijn's viewing pleasure

DNM etc

* Still not fixed

* Fixes it again.

MediHound sleeper preference is now a game preference toggle, rather than a vore panel toggle.

MediHounds will not be able to ingest SSD or catatonic players.
 2018-03-05 12:33:23 -06:00
CitadelStationBot
fef85c1eb3 [MIRROR] Fix nightshift skipping certain maint APCs (#5811) 
* Merge pull request #36082 from AutomaticFrenzy/patch/nightshift-fix

Fix nightshift skipping certain maint APCs

* Fix nightshift skipping certain maint APCs
 2018-03-05 12:30:29 -06:00
CitadelStationBot
1a4d8b94a1 [MIRROR] Halves server file access cooldowns (#5812) 
* Halves server file access cooldowns (#36139)

* Lets me actually browse logs properly

* admins get to spam harder

* Halves server file access cooldowns
 2018-03-05 12:29:50 -06:00
deathride58
4b59a31a58 Merge pull request #5805 from Citadel-Station-13/upstream-merge-35894 
[MIRROR] Refactors construction datums into components
 2018-03-05 03:18:21 +00:00
deathride58
318481e62d Merge pull request #5804 from Citadel-Station-13/upstream-merge-36095 
[MIRROR] Makes blood rage more clear
 2018-03-05 03:17:54 +00:00
deathride58
d720adf672 Merge pull request #5801 from Citadel-Station-13/upstream-merge-35895 
[MIRROR] Fixes Guardian Spirits not being able to move in stopped time along with their user.
 2018-03-05 03:16:48 +00:00
deathride58
8c7d0b2d5d Merge pull request #5799 from Citadel-Station-13/upstream-merge-36019 
[MIRROR] Fixes tinfoil hats and lengthens the time for someone else to put it on
 2018-03-05 02:46:25 +00:00
deathride58
fe25e77586 Merge pull request #5798 from Citadel-Station-13/upstream-merge-36116 
[MIRROR] Implants that grant spells to their owners, for adminbus
 2018-03-05 02:45:59 +00:00
deathride58
fc4612fe93 Merge pull request #5797 from Citadel-Station-13/upstream-merge-36071 
[MIRROR] Advanced roasting sticks, for cooking sausages
 2018-03-05 02:45:33 +00:00
deathride58
5f742c446e Merge pull request #5796 from Citadel-Station-13/upstream-merge-36108 
[MIRROR] better addresses the gas miner active turf issue
 2018-03-05 02:44:49 +00:00
deathride58
aac73b7880 Merge pull request #5794 from Citadel-Station-13/upstream-merge-36001 
[MIRROR] Removes 'release all' buttons from ORM
 2018-03-05 02:44:10 +00:00
deathride58
effbae0876 Merge pull request #5793 from Citadel-Station-13/upstream-merge-36110 
[MIRROR] Prevents history from repeating itself
 2018-03-05 02:43:47 +00:00
deathride58
a853b6fc7d Merge pull request #5791 from Citadel-Station-13/upstream-merge-36057 
[MIRROR] Fixes transforming weapons runtiming due to no butchering component
 2018-03-05 02:43:07 +00:00
ACCount
07e3c61067 Refactors construction datums into components (#35894) 2018-03-04 17:52:14 -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
Potato-Masher
923934d623 Fixes Guardian Spirits not being able to move in stopped time along with their user. (#35895) 
* I have no idea if this will work, but hopefully makes stands immune to timestops if their master is.

* That looks better

* Maybe that will work, maybe it will not.

* Checks if the summoner actually exists.

As per review advice from @DaedalusGame.
 2018-03-04 17:11:47 -06:00
Dax Dupont
df5cbc448e Fixes tinfoil hats and lengthens the time for someone else to put it on (#36019) 
* Fixes tinfoil hats and lenghtens the time for someone else to put it on

* Adds some flavor to that text
 2018-03-04 16:06:14 -06:00
vuonojenmustaturska
f3ad4b932d Implants that grant spells to their owners, for adminbus (#36116) 
* badmin implants

* honk
 2018-03-04 15:43:37 -06:00
vuonojenmustaturska
e849ab23aa Advanced roasting sticks, for cooking sausages (#36071) 
* stick

* a commit

* almost forgot something

* seems to compile
 2018-03-04 15:41:23 -06:00
Jordan Brown
caa59d936f Merge pull request #36108 from tgstation/duncathan-patch-1 
better addresses the gas miner active turf issue
 2018-03-04 15:39:08 -06:00
RandomMarine
db98a60274 Removes 'release all' buttons from ORM 2018-03-04 15:26:26 -06:00
Jordan Brown
c87455f5a3 Prevents history from repeating itself (#36110) 
* Prevents history from repeating itself

* It persisteh
 2018-03-04 15:00:48 -06:00
kevinz000
e186825f20 Fixes transforming weapons runtiming due to no butchering component (#36057) 
* Transformation weapon fix

* Infact lets fix this too
 2018-03-04 14:58:22 -06:00
kevinz000
28e91caec3 World time stat mc panel (#36111) 2018-03-04 14:54:01 -06:00
Michiyamenotehifunana
e2d49c7a77 Citadel Guns Balance Pass 5 (#5777) 2018-03-04 13:08:01 -06:00
CitadelStationBot
d3905c723f [MIRROR] Add support for auto admin when ran in single user mode (#5762) 
* Add support for auto admin when ran in single user mode

* Update client_procs.dm

* fixes compile issues, also adds in some legacy mentor code
 2018-03-04 13:06:42 -06:00
CitadelStationBot
0b07e1772a [MIRROR] Fix N^2 behavior in roundstart logout report (#5708) 
* Fix N^2 behavior in roundstart logout report (#35862)

* Fix N^2 behavior in roundstart logout report

* Skip mobs which have never had a mind

* Fix N^2 behavior in roundstart logout report

* wew
 2018-03-04 12:27:06 -06:00
Poojawa
61b121a4c9 Dogborg fixes, Borg construction animations! (#5725) 
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
 2018-03-04 11:53:48 -06:00
CitadelStationBot
12829e5cad [MIRROR] Little changes and standardisation of some admin commands (#5781) 
* Little changes and standardisation of some admin commands

* Update randomverbs.dm

* Update randomverbs.dm

* tab boi
 2018-03-04 09:39:41 -06:00
CitadelStationBot
69405b9561 [MIRROR] Allows admins to easily spawn cargo crates (#5786) 
* makes cargo spawning easy (#36094)

* Allows admins to easily spawn cargo crates
 2018-03-04 07:45:18 -06:00
CitadelStationBot
7cdeebab69 [MIRROR] Blindfolds properly apply blindness (#5782) 
* Blindfolds properly apply blindness (#36101)

* blindfolds properly apply blindness

* covering your eyes now applies blindness

* Blindfolds properly apply blindness
 2018-03-04 05:26:37 -06:00
CitadelStationBot
d446d0ed6d [MIRROR] Admin combohud verb (#5785) 
* Admin combohud verb (#36096)

* combohuds

* Update randomverbs.dm

* Admin combohud verb
 2018-03-04 05:26:22 -06:00
CitadelStationBot
3be4e3ffba [MIRROR] Makes weak alcohol not kill you (#5783) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* Makes weak alcohol not kill you
 2018-03-04 05:26:04 -06:00
LetterJay
c7448713ae Merge pull request #5775 from Citadel-Station-13/upstream-merge-36066 
[MIRROR]  Allows you to easily replace tanks in canisters & pumps
 2018-03-04 00:37:15 -06:00
LetterJay
1c002eba46 Merge pull request #5776 from Citadel-Station-13/upstream-merge-36087 
[MIRROR] Proper removal of chem implant action buttons
 2018-03-04 00:36:47 -06:00
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485 
[MIRROR] Antagonist reputation system
 2018-03-04 00:31:41 -06:00