Commit Graph

27975 Commits

Author SHA1 Message Date
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
Putnam3145
90fcc02ba9 Merge pull request #14674 from silicons/atmosstuffs
[ATMOS CHANGE TESTMERGE THIS OH GOD] adds multiz_accessible_levels infinite loop guard, reworks atmos adjacent turfs proc
2021-05-07 21:36:46 -07:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
silicons
557eddb7dc Merge pull request #14696 from Putnam3145/priority_announce_verb
Adds make priority announcement admin verb
2021-05-07 18:41:48 -06:00
silicons
633591b81e Merge pull request #14688 from SandPoot/good-tooltips
Makes tooltips good and creates a base for adding more.
2021-05-07 18:41:22 -06:00
silicons
44fdbaadcb Merge pull request #14684 from zeroisthebiggay/pirates
Pirate Update: Milk Is Not A Medical Substitute
2021-05-07 18:40:41 -06:00
silicons
e8b7abcfc6 Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin
The Unrolling Pin! (Ready)
2021-05-07 18:40:33 -06:00
Lin
d36e82c1c1 Merge pull request #14691 from silicons/radiationmaybe
so i fixed radiation not going away but it fixed the race condition that let radioactive things.. actually stack so let's make chernobyl a thing again yay :)
2021-05-07 13:51:10 -05:00
Lin
54e12f2478 Merge pull request #14690 from silicons/firefighting_foam
some changes to firefighting foam, fixes vscode launch bat
2021-05-07 13:51:05 -05:00
Lin
a40bc38c53 Merge pull request #14671 from timothyteakettle/humans-with-digi-legs
lets humans have digi legs (and avian legs)
2021-05-07 01:00:27 -05:00
Lin
470f417a6b Merge pull request #14687 from Arturlang/cum_blood_fixes
Fixes virus bottles being white
2021-05-07 00:54:53 -05:00
Putnam
6c8fa56132 Adds make priority announcement verb 2021-05-06 15:10:36 -07:00
Putnam
8d96de6b03 More tweaks, whoops 2021-05-06 14:52:17 -07:00
Putnam
ecca9d788b More supernova tweaks 2021-05-06 14:32:13 -07:00
silicons
cb1e2f3730 thing 2021-05-06 02:09:06 -07:00
silicons
97dcfd0750 Update effects_foam.dm 2021-05-06 02:02:25 -07:00
silicons
6ac964b35a e 2021-05-06 01:52:35 -07:00
SandPoot
6414b371f8 fancy description for the proc 2021-05-06 03:03:46 -03:00
SandPoot
6bd5707a63 found it 2021-05-06 02:50:32 -03:00
zerothebigboy
90930494d6 k 2021-05-05 18:43:11 -04:00
zerothebigboy
c8ebe720ec k 2021-05-05 18:25:05 -04:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Artur
e5646404d7 Fixes virus bottles being white 2021-05-05 21:34:53 +03:00
zerothebigboy
b1c20269a6 he'sstillafurry 2021-05-05 03:38:14 -04:00
zerothebigboy
5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
silicons
d7687c9f3a Merge pull request #14680 from keronshb/shadowalkengraved
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
2021-05-04 00:45:47 -06:00
silicons
1ce59b974c Merge pull request #14676 from Bapldap/patch-2
lesspopcrates(this one works)
2021-05-04 00:45:12 -06:00
silicons
45bc4fcb46 Merge pull request #14673 from TheObserver-sys/SovietCrate
Soviet Crates, now available!
2021-05-03 21:08:37 -06:00
silicons
2bf9c9d21f Merge pull request #14678 from SandPoot/fancy-gateway
Ports #55624 from tgstation
2021-05-03 21:07:03 -06:00
keronshb
834ec62c0b Nightmare Jaunt Change
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
2021-05-03 00:05:39 -04:00