shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,401 Commits 5 Branches 0 Tags
657d1f69c81cdc57c442525cfba72492bc696cb9
Commit Graph

18644 Commits

Author SHA1 Message Date
zerothebigboy
657d1f69c8 sex 2021-04-07 04:18:04 -04:00
Lin
6d82cbe363 Merge pull request #14559 from BlueWildrose/dingdong 
Brings back the prayer ding
 2021-04-05 16:19:30 -05:00
Lin
c08f90a3eb Merge pull request #14566 from TheObserver-sys/CabbageFix 
Botany Pass 3: THE CABBAGE PATCH PEOPLE MUST DIE.
 2021-04-05 16:07:30 -05:00
Lin
462486e39d Merge pull request #14567 from Putnam3145/bad-copypasta 
fixes forced climax causing a climax-with
 2021-04-05 11:37:07 -05:00
Lin
c65b1791d0 Merge pull request #14547 from SandPoot/lockers-and-laptops 
Fixing some issues for laptops and lockers/crates.
 2021-04-04 23:22:41 -05:00
Lin
05ae354d87 Merge pull request #14565 from DeltaFire15/wood-pack-correction 
Corrects the wood plank crate's name and description
 2021-04-04 23:18:55 -05:00
Putnam
a9d73424d6 fixes a bad copypasta 2021-04-04 00:10:06 -07:00
DrPainis
29451ee9ae organic repair surgery can be done on a cyborg torso (#14435) 
* repair surgery can be done on a cyborg torso

because no

* uuuuhhhh Silicons asked me to do this

* no organic repair surgery on robots
 2021-04-04 00:18:43 +02:00
Hatterhat
8b412d7d49 Update materials.dm (#14564) 2021-04-04 00:12:52 +02:00
DeltaFire
1e2b4c5a20 fix 2021-04-04 00:06:18 +02:00
The0bserver
989fb101f0 No more Human Harvests! 2021-04-02 20:05:50 -04:00
DeltaFire
b7eac4b8bb Merge pull request #14558 from BlueWildrose/buckbumble 
Bumbles no longer has a number beside their name
 2021-04-02 19:44:23 +02:00
DeltaFire
dd8c5e97f1 Merge pull request #14542 from Putnam3145/observe-log 
Added observe logging
 2021-04-02 19:42:41 +02:00
Blue Wildrose
3d8f8ffe27 Bringin' back the ding 2021-04-02 02:19:19 -07:00
Blue Wildrose
f1ef779e58 Bumbles no longer has a number beside their name 2021-04-01 16:53:47 -07:00
Blue Wildrose
4de7af5db5 Bumbles no longer has a number beside their name 2021-04-01 16:31:15 -07:00
SandPoot
2381db5f53 upload files 2021-03-31 12:35:43 -03:00
Putnam
3760be44d9 Added observe logging 2021-03-30 20:41:48 -07:00
LetterN
74c00d17f8 let's be [redacted], its really in t his year 2021-03-31 09:43:15 +08:00
Lin
c4f2267fd0 Merge pull request #14528 from BlueWildrose/Idungoofed 
Fixed being unable to fix suit sensors if damaged at all unless destroyed completely
 2021-03-28 18:02:49 -05:00
silicons
b6b62e84bc Update machine_designs_service.dm 2021-03-28 12:47:22 -07:00
qweq12yt
ae39ba3cca ok multiples of 5 tho 2021-03-27 11:38:58 -03:00
qweq12yt
afa68172ee less smoke bombs 
because maybe it would be abused too much?
 2021-03-27 11:36:52 -03:00
qweq12yt
85cad7b51a Merge branch 'master' into improvs-and-contraband 2021-03-27 11:33:01 -03:00
silicons
ebacd30cb5 Merge pull request #14440 from Putnam3145/slaughter-demon-thing 
Made slaughter demon have higher weight if there's more blood
 2021-03-27 01:38:07 -06:00
silicons
1f91d8efe3 Merge pull request #14522 from Hatterhat/rusted-hills-bruh 
calling upon the Rusted Hills no longer pokes at bluespace
 2021-03-27 01:36:49 -06:00
silicons
4f3e695afa Merge pull request #14495 from Hatterhat/synth-aug 
is it really an augmentation if you're using a synthflesh-grown limb? no, probably not, but what if you could
 2021-03-27 01:35:54 -06:00
silicons
a3d0dd6cf1 Merge pull request #14434 from dzahlus/joy 
Adds radial skin menu to joy mask, pensive, angry, flushed
 2021-03-27 01:35:18 -06:00
silicons
4f631c29bb Merge pull request #14504 from zeroisthebiggay/tritails 
i hate kitsune players so here i am porting triple kitsune tails from VORE fuck you
 2021-03-27 01:34:23 -06:00
silicons
ee4f019459 Merge pull request #14506 from timothyteakettle/loadout-tab-defines 
fixes character previews but does it using defines (thanks zero)
 2021-03-27 01:34:16 -06:00
silicons
26b011bb8b Merge pull request #14509 from R3dtail/patch-5 
Adjusts blackmarket uplink
 2021-03-27 01:34:02 -06:00
silicons
ec11627ad0 Merge pull request #14510 from Putnam3145/supernova-further-adjust 
More supernova adjustments
 2021-03-27 01:33:57 -06:00
silicons
ea797787bd Merge pull request #14511 from R3dtail/patch-6 
Removes Ichor Crates from chest rolls
 2021-03-27 01:33:48 -06:00
silicons
ce8342ed92 Merge pull request #14512 from R3dtail/patch-8 
Gives the Blackmarket Uplink a description
 2021-03-27 01:33:35 -06:00
silicons
bdbb33842e Merge pull request #14513 from Putnam3145/chaos-for-secret 
Makes threat a subsystem instead of dynamic-attached
 2021-03-27 01:33:27 -06:00
silicons
bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix 
Shields: Changes, additional flags, bug fixes, sprites
 2021-03-27 01:31:55 -06:00
Hatterhat
61af4108ea i don't wanna talk about it 2021-03-26 23:06:00 -05:00
Blue Wildrose
f6b3ef0893 probably a better way of setting this up 2021-03-26 20:11:26 -07:00
Blue Wildrose
ac0d261959 can't repair unless absolutely broken no more 2021-03-26 20:03:19 -07:00
Hatterhat
c56c730c56 bruh 2021-03-25 23:56:01 -05:00
Hatterhat
c8249c47cd uhh that's kinda fucked up bossman 2021-03-25 22:34:54 -05:00
qweq12yt
a4f0b749de god damn GRAMMAR 2021-03-25 20:18:59 -03:00
qweq12yt
5e28d34a15 seed price adjustment 2021-03-25 20:04:51 -03:00
qweq12yt
780c401d5c commented out rocket_boots, check comments 
i could port it but i would like to pass it through other players/maintainers
 2021-03-25 19:05:22 -03:00
necromanceranne
2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
qweq12yt
14e066fe61 oops left something behind, sorry 2021-03-25 18:44:28 -03:00
qweq12yt
d6ab576530 ported rocket boots 2021-03-25 18:17:47 -03:00
qweq12yt
ae44649950 ported the clear PDA 2021-03-25 18:15:48 -03:00
qweq12yt
13033bd7bb availability for items tweaked, internals box added 2021-03-25 18:09:35 -03:00
qweq12yt
9015b22f62 removed wind-up gun and derringer from code 
they were not ready, this branch is now more focused on adding stuff that is on the game already
 2021-03-25 17:34:23 -03:00