Commit Graph

2518 Commits

Author SHA1 Message Date
faaaay 7f0f7dfa32 Merge branch 'master' into departmentalclothes 2021-07-20 17:16:43 +01:00
quotefox 362e3346cc Fix. 2021-07-20 12:51:03 +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 357749cd5f Hyper butts
players can now have larger asses.
2021-07-20 11:59:33 +01:00
Archie 7ceffe217e bonk 2021-07-20 05:03:54 -03:00
quotefox ccad1678ea New gential; Anus
Ass cheeks next. and works with fleshlights and vibrators.
2021-07-20 04:20:41 +01:00
QuoteFox f914df3bc4 Merge pull request #1364 from Azarak/uuuuhhhh
Ports Long Range Gas Analyzer
2021-07-20 02:44:29 +01:00
QuoteFox 36884c6556 Merge pull request #1354 from ArchieBeepBoop/morecomponent
Chaplain Update - New Nullrods + Anti-Magic component update
2021-07-20 02:43:57 +01:00
QuoteFox 3a290ebd04 Merge pull request #1361 from EldritchBaguette/test
Fixes "medkit cabinent" typo
2021-07-20 02:43:35 +01:00
QuoteFox c17ae5fe47 Merge pull request #1356 from ArchieBeepBoop/squish2
Squish Element
2021-07-20 02:42:23 +01:00
QuoteFox 9924a12eb2 Merge pull request #1358 from ArchieBeepBoop/vv3
Ports: VV now internally always uses \ref instead of REF()
2021-07-20 02:42:00 +01:00
QuoteFox 1e1ac4558b Merge pull request #1355 from ArchieBeepBoop/phantomthiefupdate2
Obligatory Byond 513 changes, pt 2
2021-07-20 02:41:36 +01:00
Azarak fe39ee1533 Ranged analyser 2021-07-19 14:34:37 +02:00
Dimitri Bradley 52faecc81a Fixes "medkit cabinent" typo 2021-07-17 00:33:29 -05:00
Dahlular b01231fe6d Boosts the price of the HEV suit crate 2021-07-15 18:52:19 -06:00
Ghom aba8d2ad45 Merge pull request #11345 from Citadel-Station-13/kevinz000-patch-12
VV now internally always uses \ref instead of REF()
2021-07-15 19:04:48 -03:00
Archie 3f2e2bbff5 Return of the squish element 2021-07-15 18:53:13 -03:00
Archie 778f46ea00 Text 2021-07-15 18:49:14 -03:00
Archie ccb77e1c46 Tildes 2021-07-15 18:42:59 -03:00
Archie 020ba1d77c Eh 2021-07-15 18:34:43 -03:00
Archie 5fe2437773 Remove phantomthief border 2021-07-15 18:06:04 -03:00
kevinz000 21c3b8e67b Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
2021-07-15 17:56:19 -03:00
kevinz000 865ff4fa08 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2021-07-15 17:43:18 -03:00
Archie 8d33579e86 Removes holy melon anti-magic 2021-07-15 17:25:54 -03:00
faaaay d1d8535256 Merge branch 'master' into departmentalclothes 2021-07-15 20:06:30 +01:00
Winter Flare a24fe4445a Update bags.dm 2021-07-15 11:05:05 -04:00
Dahlular f130f2b8e0 Merge pull request #1350 from ArchieBeepBoop/ohno
[s] A very meme-y item.
2021-07-15 08:09:41 -06:00
Dahlular 59d06dc1f0 Merge pull request #1348 from ArchieBeepBoop/family
Removes voice of god prefbreak for something more... 'Family friendly'
2021-07-15 08:09:14 -06: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 1a5d5485da eh 2021-07-15 02:29:55 -03:00
Archie e47eb5af2e Oh yes. 2021-07-15 02:29:28 -03:00
Archie ac101ac67e Removes voice of god prefbreak for something more... 'Family friendly' 2021-07-12 20:36:08 -03:00
QuoteFox 01c789911e Merge pull request #1347 from ArchieBeepBoop/cringe
Admin pls ban he (Typo fix for the ban page)
2021-07-13 00:08:54 +01:00
Dahlular 66de151703 >gets chaos 3.75 with 19 nonvotes, and 7 votes 2021-07-12 15:37:56 -06:00
Archie 7c5ef7c91d typo fix 2021-07-09 22:45:59 -03:00
QuoteFox f1371aea92 Merge pull request #1343 from ArchieBeepBoop/sauna
Ports: Sauna ovens, but modularized
2021-07-08 18:51:26 +01:00
Kabra_men 5ad4b776e5 new statue, dungeon and some necessary changes in stargate 2021-07-06 16:57:27 -03:00
Archie 01d21b9b66 Sauna 2021-07-06 15:04:00 -03:00
Dahlular 50538b9027 Temporarily disables lone op 2021-07-03 23:52:06 -06:00
Dahlular cba3ef40b4 Merge pull request #1338 from ArchieBeepBoop/something-about-the-insanity-trait-
Fixes a runtime with hallucinations and a thing about mindbreaker
2021-07-03 23:35:39 -06:00
Dahlular 45aa075615 Merge pull request #1339 from Kabramen/Stargate-fixes
Stargate map fixes and new sandstone walls sprites.
2021-07-03 23:34:59 -06:00
Archie 24fec32815 OpFix 2021-07-04 02:30:34 -03:00
faaaay 85aee88860 Merge branch 'master' into departmentalclothes 2021-07-03 10:43:08 +01:00
Kabra_men b0a98f0c18 sandstone walls now can connect to windows 2021-07-01 17:31:17 -03:00
Kabra_men daefbb71a7 Fixes, changes and new wall sprites 2021-07-01 16:07:36 -03:00
Archie b30220c48f Fixes a runtime and mindbreaker 2021-06-29 23:25:08 -03:00
QuoteFox 5c893a6db5 Merge pull request #1337 from ArchieBeepBoop/spaceturfs
Something about scrubbing space turfs
2021-06-28 09:09:04 +01: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