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

14484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
aeb89e43f0 Automatic changelog generation for PR #5798 [ci skip] 2018-03-04 20:46:02 -06: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
CitadelStationBot
3a8e526609 Automatic changelog generation for PR #5797 [ci skip] 2018-03-04 20:45:36 -06: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
CitadelStationBot
e41bf8a21e Automatic changelog generation for PR #5794 [ci skip] 2018-03-04 20:44:12 -06: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
deathride58
bed120d202 Merge pull request #5790 from Citadel-Station-13/upstream-merge-36111 
[MIRROR] MC panel now shows world.time
 2018-03-05 02:42:49 +00:00
Poojawa
2117e8ecb0 recompiles tgui 2018-03-04 20:16:10 -06:00
CitadelStationBot
b42b4f52b4 Implants that grant spells to their owners, for adminbus 2018-03-04 15:43:38 -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
CitadelStationBot
0bb93619b9 Advanced roasting sticks, for cooking sausages 2018-03-04 15:41:23 -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
CitadelStationBot
c226ac4e98 better addresses the gas miner active turf issue 2018-03-04 15:39:08 -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
CitadelStationBot
dffe1120c7 Prevents history from repeating itself 2018-03-04 15:00:48 -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
CitadelStationBot
b7d33cbfaf Fixes transforming weapons runtiming due to no butchering component 2018-03-04 14:58:22 -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
CitadelStationBot
224ad5c296 MC panel now shows world.time 2018-03-04 14:54:01 -06:00
kevinz000
28e91caec3 World time stat mc panel (#36111) 2018-03-04 14:54:01 -06:00
CitadelStationBot
7f6edd82d0 Automatic changelog generation for PR #5777 [ci skip] 2018-03-04 13:08:03 -06:00
Michiyamenotehifunana
e2d49c7a77 Citadel Guns Balance Pass 5 (#5777) 2018-03-04 13:08:01 -06:00
CitadelStationBot
1cd45205fc Automatic changelog generation for PR #5772 [ci skip] 2018-03-04 13:07:45 -06:00
Michiyamenotehifunana
0c0c0a5485 toys and stuff (#5772) 2018-03-04 13:07:42 -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
CitadelStationBot
4259bad960 Automatic changelog generation for PR #5740 [ci skip] 2018-03-04 11:54:26 -06:00
Zna12
c3c5f86971 Tacticool sensors (#5740) 
* Tacticool Sensors

Tacticool Turtlenecks now have sensors, for those memes that want to wear them on station.

* Atom is screwing with me.

Fixed a rogue indent

* I had this part ignored. Woops.

* Code cleanup 101.

Apparently I didn't need the rest of this.

* Ree

Stupid admin.txt
 2018-03-04 11:54:25 -06:00
CitadelStationBot
4e8412ef6f Automatic changelog generation for PR #5771 [ci skip] 2018-03-04 11:54:10 -06:00
Zna12
71aa99b197 What blob (#5771) 
* What blob?

100% Spaghetti Code

* Silly mistakes made by silly people
 2018-03-04 11:54:09 -06:00
CitadelStationBot
7ac8b2b69a Automatic changelog generation for PR #5725 [ci skip] 2018-03-04 11:53:50 -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
2990c2814b Automatic changelog generation for PR #5781 [ci skip] 2018-03-04 09:39:43 -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
a2cd37b768 Automatic changelog generation for PR #5786 [ci skip] 2018-03-04 07:45:21 -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
d3515a93c1 [MIRROR] Disables night shifts and random shift times in the config (#5784) 
* Disables night shifts and random shift times in the config

Both of these are rather disruptive when you are debugging/testing.

The Config *file* should default to debugging best defaults, and the config *code* should default to production best defaults.

One day we will make a seperate production default config file

* Disables night shifts and random shift times in the config
 2018-03-04 05:27:04 -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
8e5e94cdfa Automatic changelog generation for PR #5785 [ci skip] 2018-03-04 05:26:24 -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
b4b0c920f3 Automatic changelog generation for PR #5783 [ci skip] 2018-03-04 05:26:06 -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
CitadelStationBot
c4ee86e04d Automatic changelog generation for PR #5775 [ci skip] 2018-03-04 00:37:17 -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