silicons
|
b6bb20842f
|
Yelling works
|
2021-06-13 00:50:00 -07:00 |
|
silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
silicons
|
d67c4d9fa8
|
hacky
|
2021-06-07 16:45:51 -07:00 |
|
silicons
|
2d763a9ab3
|
auto
|
2021-06-07 16:37:19 -07:00 |
|
silicons
|
eba3f554bc
|
Merge pull request #14737 from zeroisthebiggay/KILL
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
|
2021-05-23 08:52:25 -06:00 |
|
silicons
|
92e019dd56
|
Merge pull request #14716 from Putnam3145/fix-blacklisting-traits
Makes species/antag trait blacklist no longer remove ALL traits
|
2021-05-22 03:41:57 -06:00 |
|
silicons
|
e1a800ff49
|
Merge pull request #14742 from keronshb/specialhudport
(READY) Ports Special Hud icons for some simple mobs
|
2021-05-22 01:37:59 -06:00 |
|
keronshb
|
a6e157ba73
|
IT WORKS!!
|
2021-05-19 19:03:21 -04:00 |
|
Lin
|
0c77834c56
|
Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
|
2021-05-19 14:49:00 -05:00 |
|
zerothebigboy
|
bc61ada440
|
KILL
|
2021-05-19 13:24:40 -04:00 |
|
keronshb
|
60965939d6
|
bigger mobs have some special health bars (#49104)
* cool beans
* more, more!
* smol fix
|
2021-05-19 11:59:50 -04:00 |
|
Putnam
|
030361e1cc
|
suggestions
|
2021-05-18 16:18:57 -07:00 |
|
qweq12yt
|
ba20b5b8aa
|
fix emag shuttle order
|
2021-05-17 18:48:01 -03:00 |
|
qweq12yt
|
9dd372ed11
|
fix void cloak going to the void
|
2021-05-17 17:33:23 -03:00 |
|
timothyteakettle
|
34869215e8
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-14 01:59:32 +01:00 |
|
Putnam
|
1a92973d99
|
Antag/species quirk blacklist fix
|
2021-05-12 10:18:52 -07:00 |
|
silicons
|
a60f801f69
|
e
|
2021-05-12 04:23:53 -07: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 |
|
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 |
|
LetterN
|
2bf221be4f
|
fixes syndie simplemob
|
2021-05-09 21:35:15 +08: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 |
|
SandPoot
|
9cf04467a7
|
upload files
|
2021-05-05 17:55:30 -03:00 |
|
Timothy Teakettle
|
ba71bb944a
|
im not crazy but this commit breaks 90% of the game
|
2021-05-05 18:11:05 +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 |
|
silicons
|
1585d1c2be
|
fixes
|
2021-04-26 23:32:33 -07:00 |
|
silicons
|
a415453540
|
ripping off my own code
|
2021-04-26 23:29:37 -07:00 |
|
silicons
|
eb2c12ceee
|
yell wip
|
2021-04-26 23:10:10 -07:00 |
|
silicons
|
8fe45263c5
|
whew
|
2021-04-26 22:58:30 -07:00 |
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07: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 |
|