33111 Commits

Author	SHA1	Message	Date
Nadyr	0b0f1bc7c3	Merge branch 'master' into upstream-merge-13554	2022-08-28 19:14:47 -04:00
Nadyr	9803499f78	Merge pull request #4758 from CHOMPStation2/upstream-merge-13552 ... [MIRROR] Replaces adminhelp verb in macros/hotkeys	2022-08-28 19:14:17 -04:00
Nadyr	2f5373594e	Merge pull request #4753 from CHOMPStation2/upstream-merge-13545 ... [MIRROR] traumahound standardized w/ surgeon module	2022-08-28 19:11:33 -04:00
Nadyr	073fdefa50	Merge pull request #4752 from CHOMPStation2/upstream-merge-13541 ... [MIRROR] Adds customizable language keys to language menu and character setup	2022-08-28 19:10:50 -04:00
Nadyr	315fc3f015	Merge pull request #4772 from Verkister/patch-88 ... Lets belly ghosts see belly desc on transfer	2022-08-28 19:10:32 -04:00
Nadyr	3ce1acb739	Merge pull request #4749 from CHOMPStation2/upstream-merge-13540 ... [MIRROR] Deletes C&P Monolingual error	2022-08-28 19:08:34 -04:00
Nadyr	7ba13f293a	Merge pull request #4667 from CHOMPStation2/upstream-merge-13456 ... [MIRROR] Adjusts dogborg modules to be inline with regular modules	2022-08-28 19:07:32 -04:00
Nadyr	408bf4de39	Merge pull request #4767 from Holdelta/BarUpdate ... Refactoring existing CHOMPStation drinks into the modular folder, visual update to some drinks, and adding new drinks from other servers.	2022-08-28 19:06:15 -04:00
Nadyr	9afba23e25	Merge pull request #4766 from CHOMPStation2/upstream-merge-13559 ... [MIRROR] New sprite for dosimeter case + case capacity fix	2022-08-28 19:04:59 -04:00
Nadyr	2bf2a6bfbe	Merge pull request #4765 from CHOMPStation2/upstream-merge-13558 ... [MIRROR] WHY ARE YOU A PINK SQUARE, SIZE GUN?	2022-08-28 19:03:45 -04:00
Nadyr	900056aad7	Merge pull request #4762 from CHOMPStation2/upstream-merge-13555 ... [MIRROR] dragons can be trauma now	2022-08-28 19:02:45 -04:00
Nadyr	ea85058893	Merge branch 'master' into upstream-merge-13552	2022-08-28 19:00:11 -04:00
Nadyr	19f5455cee	powder that makes you say yes	2022-08-28 18:59:23 -04:00
Nadyr	d786280282	Merge pull request #4717 from CHOMPStation2/upstream-merge-13512 ... [MIRROR] Adds ticket escalation	2022-08-28 18:57:43 -04:00
Nadyr	aa36d5f3e4	Merge pull request #4755 from CHOMPStation2/upstream-merge-13547 ... [MIRROR] Fixes an accidental deletion during the language PR	2022-08-28 18:55:11 -04:00
Nadyr	2506e37d3b	powder that makes you say yes	2022-08-28 18:54:35 -04:00
Nadyr	323a57e271	Merge pull request #4747 from CHOMPStation2/upstream-merge-13536 ... [MIRROR] More casino updates	2022-08-28 18:51:48 -04:00
Nadyr	e42f26c695	powder that makes you say yes	2022-08-28 18:51:19 -04:00
Nadyr	0046492c78	Merge pull request #4736 from CHOMPStation2/upstream-merge-13531 ... [MIRROR] Allows custom species altevians to take various bits	2022-08-28 18:43:48 -04:00
Nadyr	00f8de0124	Merge branch 'master' into upstream-merge-13512	2022-08-28 18:42:56 -04:00
Nadyr	30f2552c9f	Merge pull request #4714 from CHOMPStation2/upstream-merge-13504 ... [MIRROR] [DNM] Smol oversight	2022-08-28 18:42:07 -04:00
Nadyr	a21d776ca2	powder that makes you say yes	2022-08-28 18:36:59 -04:00
Nadyr	8ddbe6094e	powder that makes you say yes	2022-08-28 18:34:35 -04:00
Nadyr	d8b6de1db0	powder that makes you say yes	2022-08-28 18:33:36 -04:00
Nadyr	4d0f889ae7	Merge pull request #4744 from CHOMPStation2/upstream-merge-13533 ... [MIRROR] Allows altevian department outfits to be selected freely	2022-08-28 18:29:20 -04:00
Nadyr	5cbb1f10d7	Merge pull request #4743 from CHOMPStation2/upstream-merge-13529 ... [MIRROR] rescue hardsuit fixy	2022-08-28 18:28:43 -04:00
Nadyr	0e6b46f278	Merge pull request #4742 from CHOMPStation2/upstream-merge-13530 ... [MIRROR] Allows use of Virtual Avatars in game without breaking things.	2022-08-28 18:28:08 -04:00
Nadyr	676e02e30a	powder that makes you say yes	2022-08-28 18:25:48 -04:00
Nadyr	1ece021275	Merge branch 'master' into upstream-merge-13504	2022-08-28 18:23:08 -04:00
Nadyr	f685fa6d4c	Merge pull request #4711 from CHOMPStation2/upstream-merge-13503 ... [MIRROR] Mentor QOL changes	2022-08-28 18:22:16 -04:00
Nadyr	bc4bc525b2	Merge pull request #4734 from ItsSelis/tgui-bellyexport ... HTML Export of Bellies	2022-08-28 18:21:53 -04:00
Nadyr	bd42153d70	Merge pull request #4614 from crabcube/master ... Vox goodies update!	2022-08-28 18:09:16 -04:00
Nadyr	ac73ed4b38	powder that makes you say yes	2022-08-28 18:07:28 -04:00
Nadyr	19d875c734	Merge branch 'master' into upstream-merge-13503	2022-08-28 18:06:43 -04:00
Nadyr	85c1d90a99	Merge pull request #4701 from CHOMPStation2/upstream-merge-13488 ... [MIRROR] Adds mentors	2022-08-28 17:59:26 -04:00
Nadyr	d56c318013	powder that makes you say yes	2022-08-28 17:58:52 -04:00
Nadyr	adcd22c09d	Merge pull request #4722 from AnymousUnknow/master ... hide_body_part flags for markings, with supplied abnormal bodytype markings.	2022-08-28 17:54:20 -04:00
Nadyr	3a9faa61dd	powder that makes you say yes	2022-08-28 17:52:34 -04:00
Nadyr	eb55c960fd	Merge pull request #4735 from CHOMPStation2/upstream-merge-13537 ... [MIRROR] Fixes teshari Site Manager cloak being for nonexistant job of Facility Director	2022-08-25 18:49:32 -04:00
Nadyr	ca9cf28abf	powder that makes you say yes	2022-08-25 18:46:47 -04:00
Verkister	ea39052de0	Lets belly ghosts see belly desc on transfer ... Makes vorgans pop that belly desc message in chat for trapped prey ghosts who are getting transfered between bellies and such.	2022-08-25 18:32:10 +03:00
crabcube	660afaa39d	Testing to clear the X ... Functions fine on test but said X here on integration	2022-08-24 21:44:08 -05:00
crabcube	b993684919	further updating wip ... corrects and names the suit this time	2022-08-24 18:39:02 -05:00
crabcube	edf63fdd44	updating wip ... correctly (?) applies armour just to vox boots.	2022-08-24 18:26:39 -05:00
Razgriz	af2379b0c7	Adjust TGS stats's AFK	2022-08-23 12:13:16 -07:00
Test Turtle	5f314473ba	Refactoring existing CHOMPStation drinks and adding new ones.	2022-08-23 02:12:28 -07:00
Novacat	4508368c53	Merge pull request #13559 from FirstSgtDan/accessories ... New sprite for dosimeter case + case capacity fix	2022-08-23 02:52:53 +00:00
Novacat	94fa35aa2a	Merge pull request #13558 from Cameron653/sizeray ... WHY ARE YOU A PINK SQUARE, SIZE GUN?	2022-08-23 02:51:46 +00:00
Casey	223a92c51e	Tweak hotkey change	2022-08-22 20:28:42 +00:00
Casey	dc19cae8bb	Merge pull request #13555 from TankTheBirb/surgeonhound ... dragons can be trauma now	2022-08-22 20:28:37 +00:00