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

5372 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
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
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
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
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
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
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
kevinz000
28e91caec3 World time stat mc panel (#36111) 2018-03-04 14:54: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
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
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485 
[MIRROR] Antagonist reputation system
 2018-03-04 00:31:41 -06:00
Poojawa
b98fb70da8 Fixes Tesla Coil Circuits and contruction 2018-03-03 22:28:55 -06:00
LetterJay
567bb359ef Merge pull request #5751 from Citadel-Station-13/upstream-merge-35968 
[MIRROR] Makes machines constructable either anchored or unanchored
 2018-03-03 15:06:37 -06:00
ShizCalev
d7409f92c0 Easy tanks in canister replacement (#36066) 2018-03-03 03:42:08 -06:00
LetterJay
d4b3ea1a49 Merge pull request #5768 from Citadel-Station-13/upstream-merge-36059 
[MIRROR] Adds rum and coke, corrects Cuba Libre recipe
 2018-03-03 02:45:57 -06:00
LetterJay
4162e8a144 Merge pull request #5767 from Citadel-Station-13/upstream-merge-36063 
[MIRROR] Meth is not good for your brain
 2018-03-03 02:45:43 -06:00
LetterJay
05b2492f81 Merge pull request #5765 from Citadel-Station-13/upstream-merge-36062 
[MIRROR] White crayons no longer make gloves look latex
 2018-03-03 02:45:13 -06:00
CitadelStationBot
c168c1582e [MIRROR] Speed up space wind by avoiding noop proc calls. (#5763) 
* Speed up space wind by avoiding noop proc calls. (#36072)

During times of high numbers of active turfs on station, this proc tends to cost more per turf then process_cell does, avoiding noops is really the only easy speed up opportunity i can see here unless i wanted to make a flag for rather or not experience_pressure_difference is called so only movables that override the default behavior (livings really) get the proc called on them

* Speed up space wind by avoiding noop proc calls.
 2018-03-03 02:32:45 -06:00
Jordie
19b24c40a8 Merge pull request #36059 from ShizCalev/cuba_libre 
Adds rum and coke, corrects Cuba Libre recipe
 2018-03-03 00:11:56 -06:00
Jordie
ddc3d5223c Merge pull request #36063 from Robustin/Methisbadmmmkay 
Meth is not good for your brain
 2018-03-03 00:11:45 -06:00
cebutris
67bd3b3d7e White crayons no longer make gloves look latex (#36062) 
* makes white crayons make white gloves, not latex

* mime subtype gloves

* Why didn't cobby think of this?

* makes mime crayons give latex gloves
 2018-03-03 00:03:16 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440 
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
 2018-03-02 23:37:41 -06:00
deathride58
b40310867e Update captain.dm 2018-03-02 21:39:10 -05:00
deathride58
fce0352d56 Update admin.dm 2018-03-02 21:38:20 -05:00
deathride58
143909a855 Update examine.dm 2018-03-02 21:32:07 -05:00
deathride58
272d0e1caf Update preferences_savefile.dm 2018-03-02 21:30:58 -05:00
deathride58
616269a8f1 Update preferences_savefile.dm 2018-03-02 21:30:14 -05:00
deathride58
797a35e5ad Update preferences_savefile.dm 2018-03-02 21:29:45 -05:00