Commit Graph

4413 Commits

Author SHA1 Message Date
KabKebab cacf5cc4ed tiny book fix 2021-10-17 12:55:31 +02:00
KabKebab 87553eea1b welcome to gato book made, from xan's text. (replaces welcome to kinaris) 2021-10-16 20:04:46 +02:00
KabKebab d1eda326c8 Merged the old gs code with the new Hyper code 2021-10-16 18:45:58 +02:00
Dahlular 1c37b0652a Merge pull request #1421 from Chemlight/ZaoCorp
Zao Corp part 1.1(?)
2021-10-13 08:23:06 -06:00
Chemlight c8f9a3ec9e ZaoCorp 1.2 2021-10-13 01:05:12 -07:00
Chemlight 66ba0e27f6 ZaoCorp Part 1.1 2021-10-13 00:48:50 -07:00
Dahlular 0c3d82edee Merge pull request #1420 from Dahlular/xenobiobad
Removes Some Xenobio Effects
2021-10-12 03:23:54 -06:00
Dahlular 82bdbfa72d Lightly slaps xenobio 2021-10-12 03:18:28 -06:00
Dahlular 4146462299 Merge pull request #1419 from quotefox/revert-1407-master
Revert "Replaces the Lavaland Syndicate Base's comms room."
2021-10-12 02:59:35 -06:00
Dahlular 2de0b35475 Revert "Replaces the Lavaland Syndicate Base's comms room." 2021-10-12 02:59:23 -06:00
Dahlular 73eed1efe0 Changes spawn conditions for many events 2021-10-12 01:16:05 -06:00
Dahlular 92c7de98c6 Merge pull request #1418 from Kabramen/Pumpkin-Head-Dullahan-fix
Pumpkin Head Dullahan Fix
2021-10-11 19:22:22 -06:00
Kabramen 627669c5f7 Update dullahan.dm 2021-10-11 12:43:35 -03:00
Dahlular 8ed86c3c9d Merge pull request #1417 from Chemlight/ZaoCorp
Zao corp Part 1
2021-10-11 08:25:02 -06:00
Chemlight 898ef4d678 ZaoCorp Part 1 2021-10-11 06:57:49 -07:00
Chemlight cf2e8dc664 ZaoCorp Part 1 2021-10-11 05:21:38 -07:00
Dahlular c22182d05c Merge pull request #1416 from DJFloofy/FUCK-ME
Avali Ears
2021-10-11 04:45:13 -06:00
Dahlular bbff6da367 Stop that. Get some help. 2021-10-11 02:39:45 -06:00
DJFloofy f1bdeb6d41 Avali Ears
Bottom Text
Its 3 in the morning and Im about to die of a ketamine overdose
2021-10-10 03:44:02 -04:00
Dahlular ae035a56f5 Merge pull request #1415 from Kabramen/cumpkin
HIGH PRIORITY (REAL): Cumpkin.
2021-10-09 12:12:34 -06:00
Kabramen f9675c9e07 New cute sprites! 2021-10-08 23:56:22 -03:00
Kabramen 7defa88dca Cumpkin 2021-10-08 20:36:23 -03:00
Dahlular ba83ad1a41 Quick fix 2021-10-06 16:13:37 -06:00
Dahlular 42f3adcbda Merge pull request #1414 from Dahlular/ccstuff
Adds some CC stuff
2021-10-06 14:04:55 -06:00
Dahlular 6bc4e766de CC dress and virginkiller 2021-10-06 13:57:30 -06:00
Dahlular 5019b2a197 Removes some racist garbage. 2021-10-06 13:56:22 -06:00
Dahlular 7e38f69b14 Merge pull request #1412 from Dahlular/dronesbegone
Temporarily Removes Drones, Replacing Later
2021-09-24 16:49:26 -06:00
Dahlular 15150c056a Temporarily Removes Drones, replacing later 2021-09-24 16:43:26 -06:00
quotefox 67561f4f96 Goat ears 2021-09-24 23:38:07 +01:00
Dahlular 7004d1137d Merge pull request #1411 from ArchieBeepBoop/Clientloss
Client/Login loss prevention - Cool down, buddy.
2021-09-24 15:43:04 -06:00
Dahlular 254343e780 Merge pull request #1410 from ArchieBeepBoop/ffs
Invisible Bodypillow Fix
2021-09-24 15:40:11 -06:00
Dahlular 77e36b9ccc Merge pull request #1409 from quotefox/dependabot/pip/tools/mapmerge2/pillow-8.3.2
Bump pillow from 8.2.0 to 8.3.2 in /tools/mapmerge2
2021-09-24 15:39:18 -06:00
Dahlular 8abb62292c Merge pull request #1408 from quotefox/dependabot/npm_and_yarn/tgui-next/tar-4.4.19
Bump tar from 4.4.15 to 4.4.19 in /tgui-next
2021-09-24 15:39:01 -06:00
Dahlular a14824e7e4 Merge pull request #1407 from Orpheus-wq/master
Replaces the Lavaland Syndicate Base's comms room.
2021-09-24 15:38:41 -06:00
Archie d20013cfe4 Login loss prevention v1 2021-09-23 19:37:06 -03:00
Archie 1e121123aa Bodypillow Fix 2021-09-23 17:44:19 -03:00
quotefox d0070cdab2 Poll Winner: Cum drips after creampie. + Fix to fleshlights.
lewd.
2021-09-14 04:00:49 +01:00
quotefox 29f640583a fix
fix
2021-09-13 22:04:02 +01:00
quotefox 82c4634732 disabled pins, not using causes runetimes. 2021-09-13 21:55:22 +01:00
quotefox 2cdfd37c63 runtime error fix with borgs sleepers. 2021-09-13 21:54:12 +01:00
quotefox 8fd8ea5380 Denbu Draft - Butt enhancer, stocked in kinkmates
Just like other genital enhancers, you now have a backside enhancer.
2021-09-13 21:15:45 +01:00
dependabot[bot] 469f636f32 Bump pillow from 8.2.0 to 8.3.2 in /tools/mapmerge2
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.2.0...8.3.2)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-08 01:19:16 +00:00
Dahlular cf9946e194 Bless Quote's Heart 2021-09-04 14:33:28 -06:00
dependabot[bot] 58d1702ef4 Bump tar from 4.4.15 to 4.4.19 in /tgui-next
Bumps [tar](https://github.com/npm/node-tar) from 4.4.15 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.15...v4.4.19)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-02 19:12:44 +00:00
Orpheus-wq 8f3b7791c9 Syndicate Lavaland Base Small Overhaul
Removes the "comms" aspect of the Syndicate Lavaland Base and replaces it with a Nanite Lab. We get barely any antags anymore and the few who do spawn don't buy keys anyway, the comms section has no use anymore.
Also adds a few quality of life things to the base
2021-08-30 14:24:06 +01:00
quotefox b75b33686f bench drops metal instead of wood, fixed. 2021-08-30 02:28:46 +01:00
quotefox 4b66e60d98 Buildable wooden benches
can now build wooden benches with wood
2021-08-30 01:33:34 +01:00
quotefox 22bf7fcb15 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-08-29 08:36:25 +01:00
quotefox a788562170 Radstorm: Reduce spawn chance
polled and won.
2021-08-29 08:36:23 +01:00
QuoteFox 1c489efbc1 Merge pull request #1403 from haha26315/Experimental-Cloning-Fix
Experimental cloning fix
2021-08-28 07:41:28 +01:00