shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,736 Commits 5 Branches 0 Tags
96878c28cf5e2d684ad2e35fd2aa6fe87f2801bf
Commit Graph

28517 Commits

Author SHA1 Message Date
silicons
a00ed83c5e Merge pull request #14883 from WanderingFox95/WanderingFox95-plushies 
[Ready] The plushie PR you didn't know we needed (but we kinda did)
 2021-06-29 08:51:24 -07:00
silicons
a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop 
Moves tendril KA upgrade disks to blood drunk miner.
 2021-06-29 08:51:10 -07:00
silicons
22ad8f2c8c Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash 
[Ready] The Daily Whiplash (Newspaper Baton)
 2021-06-29 08:50:48 -07:00
silicons
c7766b0f02 Merge pull request #14895 from shellspeed1/another-pod 
Adds a new survival pod, the penthouse pod.
 2021-06-29 08:48:55 -07:00
silicons
f4c6888f96 Merge pull request #14822 from qweq12yt/more-cargo-features 
Solving inconsistencies regarding QM being command
 2021-06-29 08:46:33 -07:00
shellspeed1
26cb16311d A 2021-06-27 20:08:33 -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
silicons
505fa13631 Merge pull request #14892 from WanderingFox95/WanderingFox95-GooglyEyes 
[Ready] Googly Eyes! (Hydroponics)
 2021-06-27 11:02:07 -07:00
silicons
5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
Putnam3145
a7765aed6f Fixes shoddy math & assumptions causing APCs in sufficiently high-power-requiring rooms to work forever (#14896) 
* Fixes shoddy math & assumptions causing bad

* i typed it. i know it did.
 2021-06-27 16:39:32 +02:00
shellspeed1
f52385ca46 all the stuff to add pod to code 2021-06-27 03:39:13 -07:00
Putnam3145
6d4d70298d Wow It's Been At Double Speed 2021-06-25 07:30:27 -07:00
WanderingFox95
eb74ad2137 And a recipe. 
You attach a newspaper to a telebaton with tape.
 2021-06-25 11:39:22 +02:00
WanderingFox95
9bd1433bbe Adds a child item to the telebaton 
identical stats for the future but different looks.
 2021-06-25 11:38:21 +02:00
Eric
6144e67208 Adds syringes, pillbottles, hyposprays to medical protolathe (#14662) 
* adds pillbottles, syringes, Hyposprays to autolathe

* Adds syringes, pillbottles, and hyposprays to starting techweb

* cuts hyposprays from autolathe

* Makes Hyposprays not shiftstart tech

* Hypospray added to advanced biotech node

* Update code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* removing hyposprays from autolathe designs

* Adds hyposprays to medical designs

* corrects issues with hypospray implementation

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-06-24 20:25:18 +02:00
WanderingFox95
6dcb54afe2 Walkingshrooms, your number 1 source of GOOGLY EYES 2021-06-24 14:56:42 +02:00
WanderingFox95
5e650075d4 Googly eyes. 2021-06-24 14:56:05 +02:00
Lin
3a82712cf9 Merge pull request #14881 from Citadel-Station-13/silicons-patch-42 
fixes silicon examine
 2021-06-23 09:50:11 -07:00
Lin
1b20e46396 Merge pull request #14876 from WanderingFox95/WanderingFox95-LoudCatsurgeon 
[Ready] Cat Surgeon Warning
 2021-06-23 09:49:03 -07:00
Putnam3145
c3db2ed8ab Fixes the varedit interface 2021-06-23 01:34:47 -07:00
Putnam3145
f1cf32d0b5 okay, we DO have to check if it's not null 2021-06-22 23:13:48 -07:00
Putnam3145
85eef816a7 actually makes the default gas damage work, whoops 2021-06-22 22:48:44 -07:00
Putnam3145
37fe5f297c fix double . in fusion scan 2021-06-22 22:38:20 -07:00
Putnam3145
18a0cab792 Makes closed turfs get removed from atmos adjacent. 2021-06-22 20:36:47 -07:00
Lin
269c845f42 Merge pull request #14877 from Putnam3145/optimize-processing 
inelastic exports no longer uselessly multiply their price by e^0 every tick
 2021-06-22 11:49:39 -07:00
Lin
0a25792663 Merge pull request #14880 from DeltaFire15/14860-fixes 
Fixes a bunch of things and some related should not sleeps because they make the CI cry
 2021-06-22 11:49:13 -07:00
WanderingFox95
e709d5cf0c More code. Shouldn't break anything. 
We'll see if it does.
 2021-06-22 13:35:37 +02:00
silicons
0dd8c03286 Update examine.dm 2021-06-21 17:43:05 -07:00
DeltaFire
d0fc25bb0e empty lastline 2021-06-21 19:11:49 +02:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
silicons
98ff06fa1a the roasted roasted roasted roasted roasted roasted roasted roasted......... (#14850) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-06-21 17:54:56 +02:00
Putnam3145
4ff019f56e Inelastic exports shouldn't process 2021-06-21 07:47:13 -07:00
WanderingFox95
49f4ca0d17 Added an announcement. 
Not sure on the exact tone of it,
but this will do for now.
 2021-06-21 16:24:59 +02:00
Putnam3145
f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
Putnam3145
e65f13637d Made hotspots take generic fires into account 2021-06-20 18:09:11 -07:00
Lin
3a914072b5 Merge pull request #14872 from Citadel-Station-13/silicons-patch-40 
it turns out i accidentally buffed glowshrooms by a factor of 21. this should probably be fixed.
 2021-06-20 16:26:21 -07:00
Lin
9117cc6a5c Merge pull request #14873 from timothyteakettle/vore 
vore href exploit fix
 2021-06-20 16:25:23 -07:00
silicons
29604b939c Update glowshroom.dm 2021-06-20 13:18:54 -07:00
qweq12yt
663a8c4853 Merge branch 'master' into more-cargo-features 2021-06-20 00:20:03 -03:00
Timothy Teakettle
0113412190 Update vorepanel.dm 2021-06-19 16:28:52 +01:00
silicons
8f3c1fe03a Update glowshroom.dm 2021-06-19 07:02:51 -07:00
silicons
c0e3af55bc Update glowshroom.dm 2021-06-19 06:59:26 -07:00
qweq12yt
d2f11206bf changes to HoP access 
he couldn't access cargo already, now it's just polished so they don't have weird cargo access that they can't use
 2021-06-19 03:15:41 -03:00
qweq12yt
8481c41087 qm can announce to station 2021-06-19 03:15:38 -03:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
silicons
fd0afa209f Merge pull request #14867 from kiwedespars/wheelyheely 
wheely heelies finally have that downside people have been telling me about
 2021-06-18 20:02:23 -07:00
silicons
ae6a648c4b Merge pull request #14869 from bunny232/21/79-the-finale 
21/79 the finale now with less map merge issues woops
 2021-06-18 20:02:07 -07:00
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
silicons
bc4773b728 Merge pull request #14831 from zeroisthebiggay/beltsprites 
TG Resprite Compendium Atomization Project | Episode Six: Beltslot Sprites & Telebaton Resprite
 2021-06-18 19:58:27 -07:00