Commit Graph

28004 Commits

Author SHA1 Message Date
WanderingFox95
eab45f0d64 Apply suggestions from code review
They're very fair.

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-19 09:48:38 +02:00
WanderingFox95
808e94899f Ear Adjustments 2021-05-19 01:38:28 +02:00
silicons
3dc78fa64d Merge pull request #14725 from zeroisthebiggay/baystation
now approaching: Baystation
2021-05-18 17:09:13 -06:00
silicons
28c0d2c3cf Merge pull request #14730 from shellspeed1/plumbing-pod
Empty mining capsule pod for all those fun projects which need space.
2021-05-18 17:09:05 -06:00
silicons
898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink
The E-Fink (Yes, really)
2021-05-18 17:08:58 -06:00
silicons
58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10
more drink mixture flavortext
2021-05-18 16:44:35 -06:00
silicons
80bb2b235b Merge pull request #14726 from zeroisthebiggay/carshalash
ports Amaretto from TG
2021-05-18 16:44:24 -06:00
WanderingFox95
502092f284 changed sound path 2021-05-17 12:40:37 +02:00
WanderingFox95
57d22c6962 Typo 2021-05-17 12:36:12 +02:00
WanderingFox95
7cbe105061 Efink 2021-05-17 12:34:38 +02:00
WanderingFox95
499111edf8 Efink 2021-05-17 12:33:39 +02:00
WanderingFox95
1d56b9ceda E-Fink 2021-05-17 12:31:46 +02:00
WanderingFox95
a947ec1322 Recipes 2021-05-17 12:30:01 +02:00
shellspeed1
e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
zeroisthebiggay
a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggay
03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggay
2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggay
8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00
zeroisthebiggay
1ff27aa732 Update drinks_recipes.dm 2021-05-15 09:43:55 -04:00
zeroisthebiggay
90f9c3cb79 Update drinks_recipes.dm 2021-05-15 09:39:56 -04:00
zerothebigboy
37873d6750 gommit 2021-05-15 08:52:24 -04:00
zeroisthebiggay
5e01bb9c22 Update ticker.dm 2021-05-15 08:35:46 -04:00
zerothebigboy
e06b354613 sex!!!!!!!!!! 2021-05-15 06:58:20 -04:00
silicons
4ffec1dafa Update gateway.dm (#14711) 2021-05-14 17:50:27 +02:00
Timothy Teakettle
739b7cea26 borg spraycans have a five second delay before being able to knock someone down again (#14627)
* Update crayons.dm

* Update crayons.dm

* kevin review changes

* Update crayons.dm

* Update code/game/objects/items/crayons.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-05-14 17:47:40 +02:00
Lin
d7f8136d5a Merge pull request #14715 from keronshb/vogsleepgone
Removes Voice of God sleep again since an undocumented change readded it.
2021-05-13 17:50:14 -05:00
zeroisthebiggay
040bcb155a Update uplink_stealth.dm 2021-05-13 05:03:09 -04:00
keronshb
6e3e075ff9 Oops forgot something 2021-05-12 13:14:54 -04:00
keronshb
fa067a481a Removes VOG sleep command again
Undocumented change.
2021-05-12 13:09:39 -04:00
silicons
5601badbff deterministic explosion system (#13392)
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
2021-05-12 05:44:53 -05:00
silicons
625488891e Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
Lavaland Wine: Pinot Mort (Ready)
2021-05-12 04:43:11 -06:00
silicons
2d455e4da2 Merge pull request #14710 from Linzolle/anthro
Anthromorphic isnt a word
2021-05-12 04:42:28 -06:00
silicons
c5f13c44a8 Merge pull request #14708 from qweq12yt/misc-fixes
[Fix] Bugs are BAD!
2021-05-12 04:42:22 -06:00
silicons
3b1d66efc5 Merge pull request #14702 from zeroisthebiggay/fineilldooitmyself
bunny ears but they're not lops (vegas style)
2021-05-12 04:42:12 -06:00
Lin
82b6443928 Merge pull request #14700 from keronshb/skewerpain
What if failing to remove a brass skewer caused *pain?
2021-05-11 14:11:07 -05:00
Lin
0a883f3796 Merge pull request #14706 from DeltaFire15/heretic-bladeshatter-bug
Fixes heretic bladeshatters, also fixes find_safe_turf since those were related
2021-05-11 14:08:34 -05:00
Linzolle
4609d732f9 more spellcheck of anthropomorph 2021-05-10 17:15:43 -05:00
Lin
59914250c3 spellcheck 2021-05-10 17:04:48 -05:00
Lin
19d6ff8371 Merge pull request #14703 from LetterN/fixes-syndie-shit
balances syndie simplemob
2021-05-10 14:29:48 -05:00
Lin
cab026c137 Merge pull request #14705 from LetterN/fixes-roundend-runtime
fixes roundend runtime
2021-05-10 14:28:47 -05:00
Lin
176a0ccebe Merge pull request #14704 from LetterN/buy-illegals
fixes-emag-on-console
2021-05-10 14:28:37 -05:00
qweq12yt
3b234405c8 fixed disky comfort spam 2021-05-10 16:06:57 -03:00
qweq12yt
8c0911e968 fix hulks breaking cuffs/zipties 2021-05-10 15:56:50 -03:00
DeltaFire
0c0e5f6d18 fixes 2021-05-10 17:44:21 +02:00
Lin
c0a56eb766 Merge pull request #14695 from Putnam3145/supernova-end-notification
Supernovae now announce when over, + other supernova tweaks
2021-05-10 01:24:05 -05:00
LetterN
1bee003d49 fixes roundend runtime 2021-05-09 22:48:50 +08:00
LetterN
57044515d2 fixes-emag-on-console 2021-05-09 21:39:26 +08:00
LetterN
2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
zerothebigboy
181dcc347b cum sex balls penis 2021-05-09 04:34:25 -04:00
keronshb
1804b7ba63 Skewer Pain
Replaces ouchie with *pain
2021-05-08 19:35:55 -04:00