shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,239 Commits 5 Branches 0 Tags
28ea9cc91cdcf1b65041244ccd72d83f468b2de7
Commit Graph

8791 Commits

Author SHA1 Message Date
silicons
4d82c219f5 Merge pull request #13437 from timothyteakettle/turret-fix 
turrets will now break instead of magically poofing out of existence
 2020-09-27 00:35:06 -07:00
silicons
987cfc7582 Merge pull request #13424 from Putnam3145/fix-cryo-objective-bull 
Makes cryo pods no longer replace already-won objectives.
 2020-09-27 00:16:45 -07:00
silicons
e602284bcb Merge pull request #13412 from Putnam3145/supermatter-bad 
Removed the supermatter sabotage objective; reworked non-murder MI13 objective picking.
 2020-09-27 00:09:56 -07:00
silicons
1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans 
Micro Powered Fans!
 2020-09-27 00:03:43 -07:00
silicons
00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia 
heterochromia: you can select individual eye colours
 2020-09-27 00:01:00 -07:00
timothyteakettle
04a7c66561 fix turret removal 2020-09-26 01:38:04 +01:00
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Putnam
1c99e59552 Makes cryo pods no longer replace already-won objectives. 2020-09-23 03:39:00 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Putnam
556a69ac78 Removed the supermatter objective; made sabotage objectives less common. 2020-09-19 22:45:32 -07:00
Dip
a3bf4ac580 Fixes requested 2020-09-19 13:02:08 -03:00
Putnam3145
62228905da Merge pull request #13382 from Citadel-Station-13/silicons-patch-36 
hulks no longer break their hand from punching a wall
 2020-09-19 06:07:04 -07:00
Putnam3145
9c305d1db6 Merge pull request #13400 from silicons/shields 
adds two procs to find exterior tiles for projecting hull shields around for later pr
 2020-09-19 06:06:46 -07:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes 
Some bodypart-related fixes
 2020-09-19 06:02:32 -07:00
Dip
fa516fc517 Set atmos pass to yes on assembly 2020-09-16 20:51:40 -03:00
Dip
8d33b3a8da convert to machinery type 2020-09-16 20:28:31 -03:00
Dip
2e9265937d duplicate fan bugfix 2020-09-16 20:01:37 -03:00
Dip
7e00d81758 Microfan Rework 2020-09-16 19:28:59 -03:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
silicons
17b21d29f3 helpers 2020-09-16 00:07:33 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Dip
394d383746 Clone Microfans 2020-09-15 19:27:58 -03:00
DeltaFire
f892309903 fixes 2020-09-15 17:35:58 +02:00
Putnam
f13af9f72e Made gases only display in analyzers if they have at least 0.005 moles. 2020-09-14 02:37:47 -07:00
DeltaFire
bd183e8e28 removes an unneeded check 2020-09-13 13:27:57 +02:00
DeltaFire
8975b93b37 no petting and not petting at the same time 2020-09-13 03:43:31 +02:00
DeltaFire
2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
silicons
18d949e674 Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou 
Brass Material Datum: "Sbetr Jryy!"
 2020-09-11 14:15:54 -07:00
silicons
10a753bf4d Merge pull request #13368 from Tupinambis/CoggyDoggy 
Cogstation Fixes and Improvements
 2020-09-11 14:14:59 -07:00
Blue Wildrose
81e9d34684 I love having my ears assaulted by 50 minesweeper_menuselect.oggs 2020-09-11 09:34:56 -07:00
Putnam
3ea7f0defa Added a gas mixture counter and fixed a segfault on exit. 2020-09-10 17:42:49 -07:00
silicons
700c129c21 Update walls.dm 2020-09-10 11:51:34 -07:00
Putnam
373f6a1068 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-10 04:57:43 -07:00
Putnam
fb17f0cc75 Somehow made monstermos over 100x as fast 2020-09-10 04:48:55 -07:00
silicons
809d6b212c Merge pull request #13344 from Putnam3145/fix-monstermos-superconduct 
Makes heat conduction work for the first time ever
 2020-09-08 01:58:19 -07:00
Tupinambis
fe7a21ebc7 Coggers Fixes + Mass Driver Things 2020-09-07 22:33:54 -05:00
silicons
07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838 
Turf visuals fix plus corrected names of a couple things.
 2020-09-07 13:42:05 -07:00
silicons
45ee1cbbf8 Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG 
Revert Drakeborgs
 2020-09-06 15:22:16 -07:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
silicons
9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
BlackMajor
63b1bfd45c Merge pull request #13303 from Citadel-Station-13/silicons-patch-27 
combat defibs now hit for disarm + 35 stamina (old stunbaton values) instead of disarm + 75 stamina
 2020-09-06 18:03:59 +12:00
BlackMajor
f12a9ccefb Merge pull request #13301 from Citadel-Station-13/silicons-patch-26 
on someone's request i am making meteors slice through station ruins like butter so they are no longer free meteor shields because i want to make meteor timer 10 minutes instead of 4
 2020-09-06 18:03:05 +12:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
BlackMajor
3eafab209d Merge pull request #13136 from Citadel-Station-13/silicons-patch-8 
the station charter rename now disallows any name with characters above a single byte in length unless an admin edits it to allow unicode
 2020-09-06 17:50:32 +12:00
The0bserver
cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04:00
silicons
6e6ca622e6 Merge pull request #13279 from Hatterhat/the-desword-block-buff 
alternate to 13728 - 60% rngblock, activeblock covers sides, effectiveness against projectiles upped
 2020-09-05 13:10:50 -07:00
silicons
7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00