Commit Graph

27956 Commits

Author SHA1 Message Date
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
Blue Wildrose fb79a2033d usr.name into user, also adding in do_after. 2021-04-04 21:34:27 -07: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 414d9d43e3 adding a gap here 2021-04-04 18:50:11 -07:00
Blue Wildrose 43d855c413 Killable space pirate sleepers 2021-04-04 17:05:18 -07: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
Eric 7a135d2346 Adds Telescopic bat to uplink Baseball bundle. 2021-04-03 17:11:06 -05:00
DeltaFire 1e2b4c5a20 fix 2021-04-04 00:06:18 +02:00
Eric 65bcb8fc35 removes bat attaching to belt
seems a little OP I guess?
2021-04-03 16:58:08 -05:00
Blue Wildrose 49c3284f16 linters quit complaining. 2021-04-03 12:45:52 -07:00
Blue Wildrose e29beaf852 I'll use this linter error as an opportunity to fix some grammar 2021-04-03 11:26:35 -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
Putnam3145 e509f1956d Removed cloning destroy; removed commented-out objs (#14539) 2021-04-02 19:48:55 +02: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
BlueWildrose 5152a605d8 this is very warming 2021-04-01 11:36:30 -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 68ad5c2e5c disposability 2021-03-30 23:56:12 -07:00
Putnam 6ae984971c Ported bluespace pipes from yogs 2021-03-30 23:25:36 -07:00
qweq12yt 37be0768b3 goodbye define - more comments 2021-03-31 01:08:01 -03:00
qweq12yt b97a38f125 todo comment
hopefully i will be able to do it in the future, or someone else will implement it
2021-03-31 00:55:14 -03:00
qweq12yt 2775543c97 additional comments 2021-03-31 00:46:07 -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 e950bfcbe4 A gone 2021-03-31 08:58:36 +08:00
LetterN a94e319acf bwob allowed 2021-03-31 08:22:27 +08:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
qweq12yt 04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03: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
Eric 81a222b90f Update weaponry.dm
adds Telescopic baseball bat and its telescopic functionalities.
2021-03-28 22:29:23 -05:00
Lin 0f5d5522b0 Merge pull request #14431 from YakumoChen/ancient-bundle
Ports Ancient bundle from TG
2021-03-28 18:09:38 -05:00
Lin 130a76677b Merge pull request #14527 from LetterN/yay-nullspace
Fixes order-of-nullspacing boards
2021-03-28 18:03:18 -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
DeltaFire ee7357c328 Merge pull request #14533 from Citadel-Station-13/silicons-patch-12
fixes automatic hydroponics system design spitting out the machine rather than board
2021-03-28 21:53:39 +02:00