shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,193 Commits 5 Branches 0 Tags
bb99be25045e05bcb287c958b7bdf667ef5a63af
Commit Graph

473 Commits

Author SHA1 Message Date
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
BlackMajor
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
BlackMajor
59d0376985 finished 2019-12-14 17:31:26 +13:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Putnam3145
09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her 
Ports AI console focus loss fix and fixes an error in my trimline code
 2019-11-28 05:37:36 -08:00
Linzolle
cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
Dap
281ddf73ba Ports AI console focus loss fix and fixes an error in my trimline code 
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
 2019-11-25 14:48:26 -07:00
BlackMajor
786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
kevinz000
ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350 
Ports Improved beach away mission and some fluff mapping items.
 2019-11-14 16:36:19 -07:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000
8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306 
Fixing gibspawner runtimes and improving them, how gruesome...
 2019-11-14 15:51:20 -07:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Ghommie
c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +01:00
Lin
df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
e02849fab7 double deletion dip sauce, now with 30% more cpu waste. 2019-11-02 19:54:20 +01:00
Ghommie
065fbdf0cb Fixing gibspawner runtimes, how gruesome... 2019-11-02 19:37:35 +01:00
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
Linzolle
266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
7b257242c2 bullets won't work... 2019-10-24 10:44:57 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
Linzolle
9250b1c103 big uppdate season 2019-10-23 21:08:47 -05:00
Ghommie
c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
Ghommie
ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Fermi
dbcda948fb Darn thing 2019-10-11 19:56:58 +01:00
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
kevinz000
42613d1800 Merge pull request #9251 from Linzolle/chaplain-fashion-time 
Allow all chaplain gear to equip the same things in their suit storage
 2019-09-13 10:42:42 -07:00
Linzolle
213bd2fc6b fixes 2019-09-12 23:35:21 -05:00
Dap
9f275ebf01 Ports trim decals 
## About The Pull Request

So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.

## Changelog
🆑
add: Trim lines!
/🆑
 2019-09-08 10:51:05 -06:00
Poojawa
9558252b93 Revert/replaces a lot of #8024 with bleed_rate 
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood.  Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
 2019-08-26 14:22:17 -05:00
Poojawa
bdae9e051b Fixes some errant issues with overlays 2019-08-26 14:15:55 -05:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
Poojawa
32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa
cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05:00
Poojawa
2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa
725a8046e1 just need items to actually have their overlays, ree 2019-08-17 04:50:24 -05:00
Poojawa
088bc484e3 Forensics re-destroyed, but better this time. 
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
 2019-08-17 02:43:59 -05:00
Poojawa
8bd54bcc54 I'm just waiting for a better idea before dumping this hot garbage again 2019-08-16 06:24:42 -05:00