shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,107 Commits 5 Branches 0 Tags
59e541d2e7df5921371ee2c01aaec2268d643c4c
Commit Graph

957 Commits

Author SHA1 Message Date
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
silicons
8710731b87 tweaks 2021-07-01 20:42:55 -07:00
Lin
0bfb671f4e Merge pull request #14482 from silicons/combat_v7 
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
 2021-06-27 13:04:29 -07:00
Putnam3145
37fe5f297c fix double . in fusion scan 2021-06-22 22:38:20 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
silicons
0ee2892bee Merge pull request #14807 from Putnam3145/make-sleeper-pref-good 
makes medihound sleeper toggle do something
 2021-06-09 11:17:39 -07:00
Putnam
86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
Putnam
fcd1ec83cc removed redundant check 2021-06-08 00:25:31 -07:00
Putnam
f6e08a8d2a include a message too 2021-06-08 00:24:54 -07:00
Putnam
a236357ebe makes medihound sleeper toggle do something 2021-06-08 00:21:19 -07:00
Putnam
d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
DeltaFire
dd33371a3b colors 2021-06-01 22:48:57 +02:00
silicons
8fe45263c5 whew 2021-04-26 22:58:30 -07:00
silicons
7ccb5bc711 fixes 2021-04-26 14:21:59 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
keronshb
b06c15ab30 Update traitordevices.dm 
Fixed
 2021-03-24 21:32:31 -04:00
keronshb
0b5cedf893 patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures (#57380) 2021-03-20 20:40:51 -04:00
silicons
1fd06a89b7 Oh Boy 2021-03-20 16:27:52 -07:00
Putnam
50c1a83c6a Adds a pAI policy config 2021-02-26 00:34:13 -08:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07:00
Lin
dbcc95ea28 Merge pull request #14262 from timothyteakettle/lawyer-message-all-href 
stops people using Message All on PDAs when their cartridge doesn't allow it
 2021-02-18 23:34:11 -06:00
Timothy Teakettle
746ca01823 Update code/game/objects/items/devices/PDA/PDA.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-19 02:10:03 +00:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Timothy Teakettle
96d80901e4 Update PDA.dm 2021-02-17 17:26:45 +00:00
Hatterhat
c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
TyrianTyrell
4f5f0eec07 Update radio.dm 2021-01-31 14:19:04 -05:00
TyrianTyrell
cfa169293c Update radio.dm 2021-01-31 14:17:53 -05:00
TyrianTyrell
318f34be78 Update headset.dm 2021-01-31 14:15:40 -05:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs 
itt: i dont test my code again - free golem ship GPSes start disabled
 2021-01-25 22:59:09 -07:00
MrJWhit
3e157c3aa8 Update headset.dm 2021-01-22 19:18:28 -05:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Blue Wildrose
80ccc93fd7 Removes breast and penis analysis from medical scanners 2021-01-20 07:32:03 -07:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky 
Good Night Disky
 2021-01-09 15:39:06 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
DeltaFire
d153d82441 Merge pull request #13931 from shellspeed1/porting-turret 
Ports disposable sentry gun for station engineers as a traitor item from TG
 2021-01-08 02:59:48 +01:00
shellspeed1
926b4ca609 Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret 2021-01-06 18:48:47 -08:00
shellspeed1
21e81faff5 Update traitordevices.dm 2021-01-06 18:48:02 -08:00
shellspeed1
b5e8d3308c Update traitordevices.dm 2021-01-06 18:40:49 -08:00
shellspeed1
67364f4254 Update traitordevices.dm 2021-01-06 18:26:07 -08:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
YakumoChen
9325daa743 Update powersink.dm 2021-01-01 03:35:54 +00:00