Commit Graph

3979 Commits

Author SHA1 Message Date
Jerry Wester
32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
Jerry Wester
19428e2579 revert bag dumping changes 2022-12-13 19:15:07 -07:00
Lin
7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
Jerry Wester
7110d617b1 revert changes to outfit.dm 2022-12-12 15:24:23 -07:00
Jerry Wester
dae5190941 Remove sandstorm edit, fix suit storage 2022-12-11 20:45:46 -07:00
Jerry Wester
a4631070a8 revert some changes 2022-12-11 20:32:42 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos
b538ad721b modsuits part 2 2022-12-11 20:30:58 -07:00
PeriodicChaos
183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
SandPoot
8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
silicons
f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties
Port of public bounties and the sales tagger from tg.
2022-10-12 03:27:37 -07:00
Hatterhat
38bd037b66 box that mf up 2022-10-04 14:14:04 -05:00
silicons
a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
2022-09-23 16:27:03 -07:00
shellspeed1
a55b2c4ff3 ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen. 2022-09-20 20:05:59 -07:00
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
Hatterhat
1f0ad3e68c its a lil janky but we take those (#15834)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2022-09-17 13:47:24 -07:00
shellspeed1
d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847)
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2022-09-17 13:33:51 -07:00
shellspeed1
1ebc2e584b makes weapons unsafe 2022-09-17 06:53:46 -07:00
shellspeed1
91c095989a stuff 2022-09-16 17:55:10 -07:00
shellspeed1
bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
shellspeed1
1130a9341e now it actually works 2022-09-09 20:02:45 -07:00
shellspeed1
f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1
fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
silicons
ad289629a7 Update _quirk.dm 2022-08-20 12:30:32 -07:00
silicons
1f5f6ce699 Merge pull request #15760 from Hatterhat/skill-issue
skill mod shuffle pr + implied complaining about why dont they reflect the actual skill xp levels themselves
2022-08-20 12:26:46 -07:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Hatterhat
36b73da81b i hate tgui i hate tgui i hate tgui 2022-08-06 15:03:33 -05:00
Timothy Teakettle
e87146bf4e debug messages, bug fix 2022-08-01 13:17:06 +01:00
Timothy Teakettle
0e20cff184 vtuber mode 2022-08-01 12:58:41 +01:00
SandPoot
c2d2a5ebf5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into handle_blood 2022-07-23 18:42:24 -03:00
Lin
1549186f6c Merge pull request #15711 from deathride58/typofix
Fixes a decade-old typo (if you know, you know.)
2022-07-23 06:27:06 +00:00
SandPoot
329e160a1f /BiologicalLife(delta_time... 2022-07-20 21:40:53 -03:00
deathride58
578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
SandPoot
57734fcafb SEND_SIGNAL always sends all arguments but second when doing the proc call 2022-07-19 20:34:34 -03:00
silicons
f7c7464043 Merge pull request #15684 from deathride58/barkfollowup
Bark followup - audio balance pass, bark intercepts, yelling nerf, falloff fix, and more!
2022-07-08 14:21:14 -07:00
TripleShades
7fa776106f maybe? 2022-06-15 17:20:15 -04:00
TripleShades
f808c23303 oops 2022-06-15 16:51:56 -04:00
TripleShades
50bab1bd63 glassware typo fix so it can be crafted 2022-06-15 16:46:00 -04:00
silicons
9ded655c71 Update ui.dm (#15683) 2022-06-14 06:04:01 +02:00
deathride58
8e27f507f6 fixes DNA generating absolutely horrid eldritch barks beyond human comprehension 2022-06-13 23:13:31 -04:00
deathride58
17917ed564 bark followup - audio balance pass, bark intercepts, yelling nerf, falloff fix, etc! 2022-06-11 19:39:48 -04:00
silicons
59a7ab04da Merge pull request #15677 from deathride58/vocalbark
Vocal barks - Fully customizable noises for talking!
2022-06-10 22:10:44 -07:00
silicons
9a17ef3bf2 Merge pull request #15663 from deathride58/blockquotes
Blockquotes for chat; Prettier examine text and more!
2022-06-10 22:09:12 -07:00
deathride58
0a60a4bcbc Merge pull request #15669 from SandPoot/sneak-100
Fix strip_mod and strip_silence
2022-06-11 01:04:13 -04:00
deathride58
512a8c783c basic code cleanup and limits 2022-06-09 23:37:49 -04:00
deathride58
425334b3b4 fuck dna 2022-06-09 15:50:40 -04:00
deathride58
f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
deathride58
8e152c38c9 adds more barks for adminbus/genetics fuckery. also adds more barks for various station mobs! 2022-06-09 14:26:05 -04:00
deathride58
2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
Lin
6f97ec2b1d Merge pull request #15656 from deathride58/animfix
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
2022-06-07 18:05:07 +00:00