Commit Graph

28294 Commits

Author SHA1 Message Date
Timothy Teakettle
da7c1ddb0a bold statement for someone who didnt test their code 2021-05-17 19:04:51 +01: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
Timothy Teakettle
6d13f09c3d Update preferences.dm 2021-05-17 11:20:47 +01:00
Timothy Teakettle
4cb0eb3418 Update preferences.dm 2021-05-17 10:59:26 +01:00
shellspeed1
e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
silicons
f802890153 Update world_topic.dm 2021-05-16 22:17:50 -07:00
Timothy Teakettle
80d287abca index magic moment 2021-05-16 03:10:35 +01:00
silicons
8ff0685f0d Update world_topic.dm 2021-05-15 18:28:00 -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
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01: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
keronshb
ef470a3baf Fixes Void Robes for Digi legs 2021-05-13 13:37:35 -04:00
zeroisthebiggay
040bcb155a Update uplink_stealth.dm 2021-05-13 05:03:09 -04:00
silicons
55ee9a00b4 woo yeah woo yeah 2021-05-12 18:24:26 -07:00
silicons
8e2921f3c0 woo 2021-05-12 17:36:01 -07:00
silicons
59f160be57 woo 2021-05-12 16:59:48 -07:00
silicons
2a3a45573f woo 2021-05-12 16:58:17 -07:00
silicons
6237928c4b woo 2021-05-12 16:55:21 -07:00
silicons
0b9d021d9b woo 2021-05-12 16:51:28 -07:00
silicons
482be2ee0d okay 2021-05-12 16:37:13 -07:00
keronshb
611dca2776 New Line at End of file 2021-05-12 17:04:10 -04:00
Putnam
1a92973d99 Antag/species quirk blacklist fix 2021-05-12 10:18:52 -07: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
silicons
3fb84eb1d8 fix 2021-05-12 03:35:02 -07:00
silicons
aeefeb6c53 woo 2021-05-12 03:33:41 -07:00
keronshb
79f5feea9f Merge remote-tracking branch 'upstream/master' into hereticadjustments 2021-05-11 17:58:41 -04:00
keronshb
4749be2ba8 Final rework
Last part.
2021-05-11 16:52:16 -04: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