Commit Graph

18678 Commits

Author SHA1 Message Date
DrPainis
a329188f95 moves list_reagents back to where it was
fuck
2021-04-17 02:56:46 -04:00
DrPainis
ea585233a2 makes goliath meat have reagents again
sorry, I lost my brain cells for a second
2021-04-17 02:56:06 -04:00
DrPainis
c69233c731 adds ash drake meat
yes, it's unnecessary
no, I don't care
let me eat drakes
2021-04-17 02:52:21 -04:00
Lin
f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff
Pirate related fixes and communication console fixes
2021-04-14 21:39:06 -05:00
Hatterhat
32bbbecc39 pirate payoff minimum from 20k to 1k (#14581)
* removes 20k minimum on pirate payoff

* Update pirates.dm
2021-04-13 15:13:53 +02:00
Blue Wildrose
8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
Lin
3fc5dc5d36 Merge pull request #14267 from Citadel-Station-13/silicons-patch-15
allows all non queen/empress SIMPLE MOB xenos to spawn from gold cores
2021-04-11 13:54:52 -05:00
Lin
ae6c7a660c Merge pull request #14586 from BlueWildrose/whattheheckdrones
Fixed drones nullspacing things they try to place on tables and in closets
2021-04-10 20:03:59 -05:00
Lin
b6b9619f2d Merge pull request #14536 from Citadel-Station-13/silicons-patch-13
removes delta_time from tgui process because it doesn't need it
2021-04-09 14:14:03 -05:00
silicons
9105413f69 Merge pull request #14574 from BlueWildrose/swippityswap
Container swapping for Pandemic machine
2021-04-08 03:24:36 -06:00
silicons
42589fc55d Merge pull request #14570 from BlueWildrose/tellmeabouttheelves
Sylvan and Mushroom languages now tongueless, EaL learnable
2021-04-08 03:24:24 -06:00
silicons
f998efa7bc Merge pull request #14551 from BlueWildrose/ThePuddler2
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
silicons
3416989b7c Merge pull request #14552 from BlueWildrose/PillsHere
I could blot the sun out with these titty pills and some certain catgirls here STILL wouldn't be satisfied.
2021-04-08 03:23:32 -06:00
silicons
a367a057e4 Merge pull request #14562 from BlueWildrose/poppinoff
Buffs the genetic mutation Autotomy
2021-04-08 03:23:22 -06:00
silicons
f1de2d37aa Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat
Adds telescopic baseball bat
2021-04-08 03:22:56 -06:00
silicons
bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies
Fixes some lizards
2021-04-08 03:22:46 -06:00
Blue Wildrose
a625b1d770 Fixed drones nullspacing things they place on tables and in closets 2021-04-07 21:45:04 -07:00
silicons
cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
2021-04-06 04:10:00 -06:00
Blue Wildrose
9239c1eb52 Beaker swapping for Pandemic machine 2021-04-05 23:06:35 -07: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
Blue Wildrose
6c79090bc2 Certain languages tongueless, machine language learnable 2021-04-04 12:25:33 -07: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
Blue Wildrose
49c3284f16 linters quit complaining. 2021-04-03 12:45:52 -07:00
Blue Wildrose
d55bb8231d Buffs autotomy 2021-04-03 10:55:34 -07: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
Blue Wildrose
fcd1080069 more booby and dick pill 2021-04-01 05:36:43 -07:00
Blue Wildrose
1dac10b1ec Might as well have it show halo stuff while puddling too 2021-04-01 04:43:18 -07:00
Blue Wildrose
b363cdd5ca fixes puddles, cultism checks, spellchecks 2021-04-01 04:29:35 -07:00
SandPoot
2aa2a8c802 actually not that much needed 2021-03-31 20:28:50 -03: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
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
SandPoot
df4779dced upload files 2021-03-29 22:26:34 -03:00
silicons
753c25db6a Update tgui.dm 2021-03-29 01:04:22 -07:00
Eric
7d19991765 Update uplink_stealth.dm
Adds Telescopic Bat to uplink
2021-03-28 22:35:26 -05: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