Commit Graph

431 Commits

Author SHA1 Message Date
Dahlular
e01b5fbb93 Merge pull request #1383 from Kabramen/stargate-stuff+new-walls
Stargate map changes and additions + new mineral wall sprites (no conflicts edition)
2021-07-28 02:45:26 -06:00
Kabra_men
d17faa961e Stargate map changes and additions + new mineral wall sprites 2021-07-24 20:39:01 -03:00
Archie
89a3d29ce1 Pilk. 2021-07-24 16:30:15 -03:00
quotefox
ea41b22c7e Whitelisting on jobs framework. 2021-07-22 14:41:29 +01:00
quotefox
4e09683c28 Dont rush these things... 2021-07-20 12:19:41 +01:00
quotefox
e661136269 do_not_cover_butt = true
new thing.
2021-07-20 12:16:56 +01:00
quotefox
e65d691415 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-07-20 09:24:37 +01:00
quotefox
bbee556d3e allow equipment removal on new genital. 2021-07-20 09:24:35 +01:00
Archie
d03c893a91 Something about leadership and mimics 2021-07-20 04:44:03 -03:00
quotefox
ccad1678ea New gential; Anus
Ass cheeks next. and works with fleshlights and vibrators.
2021-07-20 04:20:41 +01:00
Archie
27b6225c39 shuffle objects 2021-07-15 20:08:54 -03:00
Archie
ee16753426 Make that 35 actually 2021-07-15 19:49:37 -03:00
Archie
54f2ad3e70 More mimic changes 2021-07-15 19:48:07 -03:00
Dahlular
81725f27c0 Merge pull request #1323 from ArchieBeepBoop/fuck512
Component Updates - Taking 512 compatibility out back and beating it with a stick
2021-07-15 08:08:03 -06:00
Archie
254bc82b7c Missed two returns. 2021-07-06 15:15:52 -03:00
Archie
01d21b9b66 Sauna 2021-07-06 15:04:00 -03:00
Dahlular
f60fed0f12 Merge remote-tracking branch 'upstream/master' into funnylore 2021-07-06 08:17:26 -06:00
Dahlular
d8ae8c8fa7 Security information basic 2021-07-06 08:17:02 -06:00
Dahlular
65d54bbd25 Updates lore terminals about the disk 2021-07-04 00:04:56 -06:00
QuoteFox
814ed0e328 Merge pull request #1336 from RachelDoe/master
Prevent Portallights from being deepfried?
2021-06-28 09:05:14 +01:00
Archie
c26d02207a Merge remote-tracking branch 'upstream/master' into fuck512 2021-06-28 03:32:04 -03:00
RachelDoe
714c737735 Portal Panties make you cum + built in Qol
Test Description Please Ignore
2021-06-28 05:49:51 +02:00
Archie
d59e840b76 Little lower and a little higher. 2021-06-27 16:24:45 -03:00
Archie
5d80c210b6 Copium 2021-06-27 16:13:34 -03:00
Archie
8415a954de unregisters 2021-06-25 21:38:49 -03:00
Archie
fcb95dd66f Hopefully fixes leashes with signals 2021-06-25 21:06:49 -03:00
Dahlular
9867eae532 Merge pull request #1310 from Kabramen/Stargate-SG-1
Stargate SG-1 (New Gateway Map + Ghost role)
2021-06-22 23:31:56 -06:00
Archie
bfa3ac9bf3 nope 2021-06-22 04:36:09 -03:00
Archie
6fd16a596f Return 2021-06-22 04:35:45 -03:00
Archie
29855b171c Some changes 2021-06-22 04:21:43 -03:00
Archie
3e08f0b634 Good luck 2021-06-22 03:04:26 -03:00
Archie
7584df22b8 RBMK Fixes 2021-06-22 03:03:27 -03:00
Kabra_men
31d4db56a1 Stargate SG-1 2021-06-21 04:19:12 -03:00
Dahlular
e6d9be83b6 dipshit fix 2021-06-21 00:04:51 -06:00
Dahlular
68184b55aa Merge pull request #1309 from Dahlular/boredom
Small Fixes, Changes, and Additions
2021-06-20 22:20:04 -06:00
Dahlular
9467a3504c Sizeray sprite 2021-06-20 21:34:15 -06:00
Archie
3341978849 Whoops! 2021-06-20 16:38:38 -03:00
Archie
b52981aab9 whoops2 2021-06-20 06:59:25 -03:00
Archie
f5713b39a1 whoops. 2021-06-20 06:50:31 -03:00
Archie
551cde343c blacklists bots 2021-06-20 06:06:58 -03:00
Archie
3bae2aa07f Slight refactor 2021-06-20 02:26:10 -03:00
Dahlular
87ab1217f0 Makes size slowdown less severe 2021-06-18 17:19:34 -06:00
quotefox
1a68b2a347 caw fix 2021-06-18 17:22:35 +01:00
Dahlular
5f24f0e604 Merge pull request #1284 from ArchieBeepBoop/lore_entry
Adds more lore terms to Layenia + NDisk entry
2021-06-16 17:33:27 -06:00
Archie
f4b52e4c6d Adds more lore terms to Layenia + NDisk entry 2021-06-16 16:16:20 -03:00
quotefox
2e53798e05 *chirp and *caw for avians.
emotes.
2021-06-16 18:16:10 +01:00
Dahlular
d42c8e09c0 Merge pull request #1283 from ArchieBeepBoop/tendril
Proposed crystalline tendril change
2021-06-15 23:32:47 -06:00
Archie
bac8718f71 Proposed tendril change 2021-06-16 02:23:48 -03:00
Archie
ed1c980ca6 This too 2021-06-16 02:09:31 -03:00
Archie
351bb85785 Whoops, debug 2021-06-16 01:25:38 -03:00