shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,903 Commits 5 Branches 0 Tags
89d0c590e6cb65225210225b6a72c0d9639e4069
Commit Graph

19303 Commits

Author SHA1 Message Date
silicons
89d0c590e6 Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs 
Custom Kegs
 2021-07-18 15:06:30 -07:00
silicons
5895eb0d31 Merge pull request #14926 from YakumoChen/human-leather-hats 
Human leather hats
 2021-07-18 15:06:22 -07:00
silicons
7cd89978f2 Merge pull request #14933 from keronshb/stripdcport 
[PORT]  Stripping a disconnected player will tell them when they come back (+Lazynull)
 2021-07-18 15:05:48 -07:00
silicons
9d741fc81c Merge pull request #14941 from SandPoot/vore 
Vore additions/update
 2021-07-18 15:05:33 -07:00
SandPoot
b5b033e43e Update bellymodes.dm 
oops
 2021-07-16 15:07:11 -03:00
SandPoot
6445cfdd9d Removes spontaneous vore and reorganizes buttons 2021-07-15 17:32:03 -03:00
WanderingFox95
6ed0d699e9 keg code, far away from kegs 
cause it's just a big barrel that doesn't ferment anything.
 2021-07-15 01:50:01 +02:00
Putnam3145
cf3c600938 doy 2021-07-13 22:13:25 -07:00
Putnam3145
9d9b74276e Fixes a major source of lag 2021-07-13 22:07:26 -07:00
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
Lin
d50eb91632 Merge pull request #14921 from Putnam3145/componentize-acid 
Componentizes acid
 2021-07-13 11:52:43 -07:00
Lin
1bf06983dc Merge pull request #14938 from Putnam3145/hotspot-fix 
Makes fire visuals respect hyper-nob
 2021-07-13 11:39:36 -07:00
Lin
daf837f89e Merge pull request #14924 from Citadel-Station-13/restraints 
handcuffs now require you to stand still to break out of again. Buffs bolas and energy snares breakout time because I forgot to do that when I made you able to move while breaking out of it
 2021-07-12 00:03:39 -07:00
Lin
3b1bef2729 Merge pull request #14922 from Putnam3145/remove-dirt-buildup 
Removes causes_dirt_buildup_on_floor and replaces it with just making humans do that in their Move
 2021-07-11 10:27:31 -07:00
Putnam3145
70a5dd3693 yes 2021-07-10 22:53:14 -07:00
Putnam3145
cf9cb01f3a makes fire visuals respect hyper-nob 2021-07-10 14:26:48 -07:00
silicons
d0b3857cb6 Merge pull request #14842 from WanderingFox95/WanderingFox95-TheWheelchairPRs 
[Ready] Wheelchair Sprite Rollback + Motorized Hoverchairs
 2021-07-09 16:50:00 -07:00
keronshb
c7d1c9d8e8 Ports Stripping log when dc'd 2021-07-07 21:12:44 -04:00
DeltaFire
dd71d12359 aaaaaaaaa 2021-07-05 15:28:39 +02:00
YakumoChen
bff3c840c0 human skin hats 2021-07-05 05:04:18 +00:00
YakumoChen
2d8ba411a4 human leather hat 2021-07-05 04:57:14 +00:00
silicons
18fb23bb1f Update carbon.dm 2021-07-04 18:19:31 -07:00
silicons
472fda9504 Merge pull request #14833 from zeroisthebiggay/finallytools 
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
 2021-07-04 10:59:43 -07:00
silicons
2b1aa8a6fc Merge pull request #14911 from Putnam3145/euclidean-diagonals 
Makes diagonal movement euclidean
 2021-07-04 10:58:08 -07:00
silicons
1620aa46da Update carbon.dm 2021-07-04 10:55:02 -07:00
Putnam3145
21c77d25a2 yeah yeah sure whatever 2021-07-03 22:40:09 -07:00
Putnam3145
2be56ab992 Removes causes_dirt_buildup_on_floor 2021-07-03 22:19:05 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
Putnam3145
970e089fb0 glass houses 2021-07-03 03:52:07 -07:00
Putnam3145
15078f0f71 Properly optimizes watchers 2021-07-03 03:50:43 -07:00
Putnam3145
e11cc190e7 Watcher optimization 2021-07-03 03:40:34 -07:00
silicons
4fa81ba13c Merge pull request #14878 from Putnam3145/remove-sleeps 
Hopefully fixes whatever requires SHOULD_NOT_SLEEP to be commented out in processing
 2021-07-01 21:57:19 -07:00
Putnam3145
f1bcbc2573 Makes diagonal movement euclidean 2021-07-01 12:09:39 -07:00
Putnam3145
9068019bca Merge pull request #14903 from silicons/spray_fix 
fixes and rewrites sprays
 2021-07-01 10:55:28 -07:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -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
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
silicons
d59ced8f28 changes 2021-06-28 19:15:29 -07:00
silicons
5ef742ffc1 logic 2021-06-28 18:46:25 -07:00
silicons
e690cea147 fix 2021-06-28 18:33:14 -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
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