shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,690 Commits 5 Branches 0 Tags
f034c7c53646c150b2bbfa7d010adb87806939f0
Commit Graph

33690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000
f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
kevinz000
3a843f6da4 a 2020-05-05 17:06:07 -07:00
kevinz000
56fe430a25 ok (#12119) 2020-05-05 23:18:09 +02:00
Lin
32204093b2 Merge pull request #12108 from Putnam3145/replace-pAI-button 
Replaces the pAI candidate button with a ghost roles button
 2020-05-05 20:54:57 +00:00
kevinz000
4327d8eb87 why did i design this way why why why 2020-05-05 04:32:35 -07:00
kevinz000
f50e661e0a Merge pull request #12106 from Putnam3145/revert-supermatter 
Reverts #10352.
 2020-05-04 21:21:09 -07:00
Ghom
066479da5f mandatory bump to savefile version. 2020-05-05 06:13:17 +02:00
kevinz000
395e3e41cc Merge pull request #11874 from Ghommie/Ghommie-cit682 
General taur visuals refactor and other things.
 2020-05-04 20:52:33 -07:00
kevinz000
e26bf5b2af Merge pull request #12115 from Kraseo/the-funny-aheal 
Slow death of Mining PvP: Removes aheals from legion cores
 2020-05-04 20:46:40 -07:00
Ghommie
3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-05 05:44:55 +02:00
Lin
0acec2e56f vendors now accept dollar bills again (#12109) 
* make vendors accept bills

* build

* forgot that function

* this is better

* i thought i had a hook for this
 2020-05-05 05:38:19 +02:00
Lin
367bb0f71c Merge pull request #12072 from Psody-Mordheim/browhatifweusedallthejobslotsduringroundstart 
Lets actually use all the positions
 2020-05-05 00:49:25 +00:00
Lin
e1c97d4261 Merge pull request #12090 from coldud13/radradio 
Radiation collectors now alert engineers when empty
 2020-05-05 00:47:23 +00:00
Lin
c3dfcf1cfe Merge pull request #12104 from timothyteakettle/food-quality-2 
sliced foods have the same quality as the item that was cut
 2020-05-05 00:46:44 +00:00
Kraseo
f760919108 actually makes your speed reset to normal once the status is gone rather then when you get hit again 2020-05-04 21:06:15 +02:00
Kraseo
3cf7fd5105 pleases the travis god 2020-05-04 18:47:57 +02:00
Kraseo
c79ece7449 really surprised this wasn't done earlier 2020-05-04 18:30:27 +02:00
Putnam
c1cd4d104f Replaces the pAI candidate button with a ghost roles button 2020-05-03 20:31:11 -07:00
Putnam3145
e36bd50ad9 Makes G gluid calcs only happen when it's required (#12095) 
* Made G fluid calcs only happen on moment it's required.

* whoops

* Update modular_citadel/code/modules/arousal/organs/testicles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-04 05:08:01 +02:00
MrJWhit
2ce118f851 MetaStation atmos update (#12099) 
* Finishes up meta station atmos

* Update MetaStation.dmm
 2020-05-04 05:05:27 +02:00
Putnam3145
bb2942d0b8 Fixes a gibber runtime. (#12103) 2020-05-04 05:05:13 +02:00
kevinz000
87858e8f60 Update sentience.dm (#12101) 2020-05-04 04:59:04 +02:00
Putnam
801956a1f9 Reverts #10352. 2020-05-03 17:44:00 -07:00
Timothy Teakettle
5f14ae28a1 food quality with sliced foods 
yay
 2020-05-03 23:06:54 +01:00
Lin
793cbd6cbd Merge pull request #12094 from Ghommie/Ghommie-cit719 
Makes privates not drop upon disembowelment or gibbing.
 2020-05-03 21:24:44 +00:00
kevinz000
8dee57b3d7 Merge pull request #12093 from Citadel-Station-13/Ghommie-patch-4 
[s] Fixing a cargo exploit
 2020-05-03 01:54:53 -07:00
MrJWhit
a5c3e3ff2b Oh god please let this be the final boxstation update (#12089) 2020-05-03 03:53:44 +02:00
kevinz000
8f29839dbf Runechat Port (#12065) 
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
 2020-05-03 03:53:19 +02:00
kevinz000
d4e6fada75 Update mirage_border.dm (#12092) 2020-05-03 03:50:38 +02:00
kevinz000
c1436c4c7b Maptick lag minimization port (#12066) 
* extools.dll

* backend

* queued pipenet builds

* oh yeah we don't have that

* wow

* Update air.dm
 2020-05-03 03:34:33 +02:00
kevinz000
5bf7fd0030 Merge pull request #12087 from Ghommie/Ghommie-cit718 
Fixing more issues.
 2020-05-02 15:56:28 -07:00
kevinz000
5bf5796fac Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3 
Webedit bugfixes
 2020-05-02 15:56:22 -07:00
kevinz000
b68f1aaf72 Merge pull request #12084 from Ghommie/Ghommie-cit717 
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
 2020-05-02 15:55:19 -07:00
kevinz000
3cb4ef24ba Merge pull request #12081 from Ghommie/Ghommie-cit716 
Fixing some runtimes with kevinz skills and holodeck hotspots.
 2020-05-02 15:55:10 -07:00
kevinz000
e9062c5617 Merge pull request #12080 from Citadel-Station-13/Ghommie-patch-1 
bumping up mapmerge requirements.txt
 2020-05-02 15:54:56 -07:00
kevinz000
fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 
Fixing several reported issues.
 2020-05-02 15:54:32 -07:00
kevinz000
ae695aeebd Merge pull request #12074 from Sishen1542/bramch 
makes traitor chap cult items minimum 20 pop
 2020-05-02 15:54:12 -07:00
Lin
f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Lin
a5d84b1e80 Merge pull request #11969 from Ghommie/Ghommie-cit698 
Scavenging element.
 2020-05-02 19:09:37 +00:00
Ghommie
592198d659 Makes privates not spew around upon disembowelment or gibbing. 2020-05-02 20:01:54 +02:00
Ghommie
42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie
7ae2615f51 Whops. 2020-05-02 19:13:21 +02:00
Ghom
bdbe6c062e Fixing a cargo exploit 2020-05-02 19:11:30 +02:00
Ghommie
c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Putnam3145
c1d1e4f0c0 Properly closes some bold tags. (#12088) 
* Fixes some unmatched <b>s

* remember to ctrl+s
 2020-05-02 14:53:17 +02:00
coldud13
65104be982 rad collectors now announce when empty 2020-05-02 18:55:58 +10:00
Ghommie
202b517fa0 Fixing more issues. 2020-05-02 02:05:56 +02:00
Ghom
8bad031979 Update shields.dm 2020-05-02 01:01:14 +02:00
Ghom
400e2523c2 paint remover issue webedit. 2020-05-02 00:55:18 +02:00
DeltaFire15
21c9c98412 > & < agony (#12082) 
hm yes today a check being the wrong way will break exo nanites.
 2020-05-02 00:36:03 +02:00