shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,295 Commits 5 Branches 0 Tags
8e3673480f78efcfa8d7d1982bd43720fc5b012a
Commit Graph

1628 Commits

Author SHA1 Message Date
Ghom
1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters 
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
 2020-02-14 19:21:48 +01:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
kevinz000
9459212692 Update brigdoors.dm 2020-02-11 08:51:24 -07:00
kevinz000
cc0b815a5d Update brigdoors.dm 2020-02-11 08:47:32 -07:00
kevinz000
276f4b5fae Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:32:01 -07:00
kevinz000
690c14a716 Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:29:22 -07:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup 
Hijack Implant
 2020-02-10 04:16:14 -07:00
Ghom
0d37700836 Merge pull request #10926 from keronshb/PirateBombProof 
Buffs the Pirate Ship to be bomb resistant
 2020-02-10 08:40:10 +01:00
keronshb
1492586f76 Fixes round 3? 4? 
Should fix the last round of requests?
 2020-02-09 18:18:55 -05:00
keronshb
60a3b134a3 Should fix the rest of the requested changes 
Title
 2020-02-09 17:30:22 -05:00
keronshb
9609eb64e0 Fixes some files and pathings for this 
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
 2020-02-09 15:18:15 -05:00
Lin
5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558 
runtime is forever, errors are eternal.
 2020-02-07 17:29:49 +00:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
9a4432b3ac initial commit 2020-02-06 00:03:17 -07:00
kevinz000
927b9d0622 Revert "Merge pull request #10883 from ancientpower/ghost-newscasters" 
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
 2020-02-05 23:50:41 -07:00
kevinz000
3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters 
Allows ghosts to read newscasters and books
 2020-02-05 23:46:04 -07:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof 
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
 2020-02-05 18:28:00 -05:00
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Ghom
ee2ab7c9f0 Update defibrillator_mount.dm 2020-02-04 23:51:55 +01:00
Ghom
3cd6cfb7d5 Update defibrillator_mount.dm 2020-02-04 23:50:33 +01:00
Lin
66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3 
Fixing little blood bank gnerator examine runtime error.
 2020-02-04 20:36:28 +00:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00
kevinz000
66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
 2020-02-04 03:35:33 -07:00
Ghom
6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
ancientpower
5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538 
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
 2020-02-02 16:31:59 -07:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Ghom
5b91908674 Fixing little blood bank gnerator examine runtime. 2020-02-02 04:27:17 +01:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Tupinambis
ffa7590203 Status Displays should now actually work 2020-01-30 16:07:26 -06:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
kevinz000
e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
 2020-01-29 20:15:22 -07:00
Ghommie
05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
kevinz000
3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3 
An oversight with one of the new area helper procs.
 2020-01-28 17:55:39 -07:00
Ghom
6567f9dd0d Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8 
buffs door crushing
 2020-01-27 05:38:59 +01:00
Ghom
7b49d4842a Fire alarms. 2020-01-27 05:05:08 +01:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
kevinz000
603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450 
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
 2020-01-25 19:33:26 -07:00
Artur
6529a34dbc Reviever suggestions 
HTML doesnt need compiling.
 2020-01-25 15:18:18 +01:00
kevinz000
f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524 
Even more runtime fixes.
 2020-01-25 05:54:20 -07:00
kevinz000
9ba6984f4f Update door.dm 2020-01-25 05:49:38 -07:00