Commit Graph

18794 Commits

Author SHA1 Message Date
timothyteakettle
f4bb5255ab Revert "big changes"
This reverts commit 7ac50b7ba2.
2021-05-03 22:43:32 +01:00
timothyteakettle
7ac50b7ba2 big changes 2021-05-03 22:43: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
d32770a0fa test 2021-05-02 22:19:41 +01:00
Timothy Teakettle
2daed9250f some bugfixes 2021-05-02 18:30:35 +01:00
Timothy Teakettle
7efadade15 href fix 2021-05-01 20:55:13 +01:00
Timothy Teakettle
8aed1b4236 more color code 2021-05-01 20:37:22 +01:00
Timothy Teakettle
ddc3e3b3b2 Update preferences.dm 2021-05-15 21:24:20 +01:00
Lin
c80c974b6c Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
2021-04-29 22:24:00 -05:00
silicons
e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
silicons
986aef27b2 Merge pull request #14648 from SandPoot/decal-painter-tgui
Decal Painter menu is no longer shit and has visible previews.
2021-04-28 21:20:24 -06:00
silicons
cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
2021-04-28 21:17:55 -06:00
silicons
d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
2021-04-28 21:17:36 -06:00
silicons
17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
silicons
9bef72f205 Merge pull request #14635 from necromanceranne/blindfold_but_not
Adds fake blindfolds. For reasons.
2021-04-28 21:17:06 -06:00
silicons
86bdb2455d Merge pull request #14636 from TheObserver-sys/CrateDeal
Inconsistency Fixes, 10MM Rifle tweaks.
2021-04-28 21:16:58 -06:00
Timothy Teakettle
cb98cbd19f colour backend 2021-04-28 22:33:05 +01:00
qweq12yt
3afb801036 huh 2021-04-28 15:41:20 -03:00
Timothy Teakettle
72a009dc7c based? 2021-04-28 19:31:20 +01:00
timothyteakettle
2f5cb63994 who deleted this 2021-04-28 17:37:09 +01:00
timothyteakettle
79b73a53a0 working buttons probably 2021-04-28 16:53:12 +01:00
Timothy Teakettle
06e003f49b functionality 2021-04-26 21:58:12 +01:00
silicons
03fa382f36 Update autobunker.dm 2021-04-26 13:57:34 -07:00
Timothy Teakettle
ca3ef3b0f3 X button 2021-04-26 18:02:47 +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
a6a3f99539 rp marking ui 2021-04-25 20:57:02 +01:00
Timothy Teakettle
371b250623 unused var 2021-04-25 13:24:04 +01:00
Timothy Teakettle
f243c6b7c4 makes them apply properly 2021-04-25 13:23:16 +01:00
SandPoot
90661d3687 upload files 2021-04-24 21:37:01 -03:00
timothyteakettle
97e18833d5 better debug info 2021-04-25 00:07:59 +01:00
Timothy Teakettle
fce471cabb debug messages 2021-04-24 23:40:55 +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
ec41b301c7 a 2021-04-24 18:55:07 +01:00
Timothy Teakettle
869124bb50 markings 2021-04-24 15:56:57 +01:00
WanderingFox95
80f4f1b4b3 Cleaning up something annoying 2021-04-24 11:36:49 +02:00
The0bserver
c7b231637e boxes of ammo, also fire not weapon is bullet 2021-04-24 00:53:57 -04:00
SandPoot
f40f4c8257 upload files 2021-04-23 19:30:28 -03:00
WanderingFox95
bda2865530 Made the description actually describe the limitaitons 2021-04-23 23:24:41 +02:00
WanderingFox95
35269554bb Adjusts TC cost
Shouldn't be over half your TC, if the Dart Pistol is only 2 TC and infinitely more useful under non-role restricted circumstances
2021-04-23 23:18:13 +02:00
WanderingFox95
4e0bf12c0c Modifies dart size and properties
They inject less but pierce again
2021-04-23 23:15:40 +02:00
WanderingFox95
1d42e9f4e0 Adjusts projectile count and delay 2021-04-23 23:12:58 +02:00
Timothy Teakettle
e89b05cfdd oh dear 2021-04-23 21:13:32 +01:00
necromanceranne
ff866f3f9d Changes emp_vulnerability from the probably to the division of the emp severity. Higher is better. 2021-04-23 12:17:13 +10:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
Lin
0c5d19ecc8 Merge pull request #14633 from Citadel-Station-13/silicons-patch-24
fixes a slightly important thing
2021-04-22 18:28:35 +00:00
necromanceranne
c924d47911 brings the values down even further 2021-04-22 13:13:10 +10:00
necromanceranne
0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10: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