Commit Graph

5991 Commits

Author SHA1 Message Date
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01: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
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
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
qweq12yt
8c0911e968 fix hulks breaking cuffs/zipties 2021-05-10 15:56:50 -03:00
Timothy Teakettle
be9b1ddffb fixes 2021-05-10 14:43:45 +01:00
Timothy Teakettle
6095b4724f fixes fox markings legs 2021-05-10 01:54:24 +01: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
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
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
timothyteakettle
bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle
b1f84f94db Update body_markings.dm 2021-05-06 22:43:31 +01:00
timothyteakettle
80599201cf better fix 2021-05-06 22:39:07 +01:00
timothyteakettle
cb12843a34 bugfix 2021-05-06 22:35:15 +01:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Timothy Teakettle
d39a60dd6b casually list the matrixes for several hundred sprites 2021-05-05 21:24:07 +01:00
Timothy Teakettle
ea071bd031 comment 2021-05-05 18:28:55 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
timothyteakettle
7265c7111c new limb covering var for markings 2021-05-03 22:47:22 +01:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
ac504d679b digi humans 2021-04-30 14:07:44 +01:00
silicons
17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
timothyteakettle
2f5cb63994 who deleted this 2021-04-28 17:37:09 +01:00
silicons
7c1358a39d Merge pull request #14642 from SandPoot/tgui-select-equipment-menu
TGUI Select Equipment menu
2021-04-25 17:10:09 -06:00
DrPainis
e313fed033 hallucinations are capitalized too 2021-04-25 19:04:07 -04:00
Timothy Teakettle
f243c6b7c4 makes them apply properly 2021-04-25 13:23:16 +01:00
WanderingFox95
ace2f522fb No more Suicidal Parrots! (Ready) (#14628)
* Modifies Parrots

They spawn from hostile triggers, not as friendly pets now.

* Removes Parrots from Gold Extracts altogether
2021-04-24 21:47:04 +02:00
DrPainis
7d6cb67c91 literally just changes one letter (#14634) 2021-04-24 21:40:41 +02:00
Timothy Teakettle
869124bb50 markings 2021-04-24 15:56:57 +01:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons
75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
2021-04-21 13:50:46 -06:00
DrPainis
ac96276f8e literally just changes one letter 2021-04-20 16:20:44 -04:00
silicons
f0c2188c5f Merge pull request #14443 from necromanceranne/baton_change_pr
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
2021-04-20 05:52:59 -06:00
silicons
74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
2021-04-18 19:02:53 -06:00
silicons
af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
2021-04-18 19:00:14 -06:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
silicons
9c780f7672 Merge pull request #14624 from DrPainis/patch-9
adds ash drake meat
2021-04-18 18:51:34 -06:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
silicons
02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles
ports deathrattle implants but without mob statchange because i am not gonna port that today
2021-04-18 18:48:08 -06:00
DrPainis
ec67182421 makes drakes drop meat 2021-04-17 02:58:22 -04:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
Lin
3fc5dc5d36 Merge pull request #14267 from Citadel-Station-13/silicons-patch-15
allows all non queen/empress SIMPLE MOB xenos to spawn from gold cores
2021-04-11 13:54:52 -05:00
Lin
ae6c7a660c Merge pull request #14586 from BlueWildrose/whattheheckdrones
Fixed drones nullspacing things they try to place on tables and in closets
2021-04-10 20:03:59 -05:00
zerothebigboy
a7c061392b i hate tg code 2021-04-08 18:05:36 -04:00
silicons
f998efa7bc Merge pull request #14551 from BlueWildrose/ThePuddler2
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00