68050 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Razgriz	bdfd580f5f	powder that makes you say yes	2022-02-17 17:31:15 -07:00
Casey	1ffb955516	Misc Tweaks	2022-02-17 13:02:10 +00:00
Razgriz	1161e35259	Merge pull request #3688 from CHOMPStation2/upstream-merge-12254 ... [MIRROR] Eggnog town tweak	2022-02-16 21:38:35 -07:00
Razgriz	7add01706c	Merge pull request #3687 from BlackMajor/bingus ... Makes floor engraving require grab intent instead of help	2022-02-16 21:37:32 -07:00
Razgriz	3739e9f885	Merge pull request #3686 from CHOMPStation2/upstream-merge-12245 ... [MIRROR] Fixes a bunch of xenobio bugs	2022-02-16 21:35:32 -07:00
CHOMPStation2	0eac30296f	Eggnog town tweak	2022-02-17 03:36:53 +00:00
Novacat	130ec1383d	Merge pull request #12254 from Very-Soft/fixeggnogturrt ... Eggnog town tweak	2022-02-17 03:36:53 +00:00
BlackMajor	c9d38f0831	grab, dummy	2022-02-17 14:37:42 +13:00
BlackMajor	4b2f38230b	Update floor_attackby.dm	2022-02-17 14:32:56 +13:00
CHOMPStation2	502b2b230f	Fixes a bunch of xenobio bugs	2022-02-17 01:02:09 +00:00
Novacat	6e7f83fb8b	Merge pull request #12245 from Heroman3003/xenobio-fixes ... Fixes a bunch of xenobio bugs	2022-02-17 01:02:09 +00:00
Razgriz	91015fe949	Merge pull request #3677 from CHOMPStation2/upstream-merge-12225 ... [MIRROR] Item bank tweak!	2022-02-16 14:42:10 -07:00
Razgriz	7f29b95ebe	Merge pull request #3683 from CHOMPStation2/upstream-merge-12241 ... [MIRROR] Adds lollipops to Nanomed	2022-02-16 14:38:37 -07:00
Razgriz	238be3f2e3	Merge pull request #3678 from BlackMajor/patch-12 ... Fixes Merc Suppressors being unable to take damage from bullets	2022-02-16 14:29:33 -07:00
Razgriz	309a110ca4	powder that makes you say yes	2022-02-16 14:29:01 -07:00
Razgriz	02464b1b20	Merge pull request #3676 from CHOMPStation2/upstream-merge-12222 ... [MIRROR] Uncapitalize curious crystal	2022-02-16 14:27:36 -07:00
Razgriz	d41f1c7a49	Merge pull request #3674 from CHOMPStation2/upstream-merge-11897 ... [MIRROR] [MIRROR] Initialize engine_loader landmark immediately	2022-02-16 14:27:14 -07:00
Razgriz	61ea9342d8	Merge pull request #3673 from CHOMPStation2/upstream-merge-12217 ... [MIRROR] removes a CC teleport avenue	2022-02-16 14:26:56 -07:00
Razgriz	fcde43eaae	Merge pull request #3672 from CHOMPStation2/upstream-merge-12218 ... [MIRROR] No Quantum Pads on Shuttles	2022-02-16 14:26:38 -07:00
Razgriz	45e96747df	Merge pull request #3671 from CHOMPStation2/upstream-merge-12087 ... [MIRROR] [MIRROR] Fixes literally everything dismantling walls	2022-02-16 14:26:20 -07:00
Razgriz	41832fdc16	Merge pull request #3670 from CHOMPStation2/upstream-merge-12210 ... [MIRROR] [MIRROR] Cybernetic Augments and Sick Tats	2022-02-16 14:26:02 -07:00
Razgriz	15d182432a	Merge pull request #3668 from CHOMPStation2/upstream-merge-12212 ... [MIRROR] Admin resize adjustments	2022-02-16 14:25:11 -07:00
Razgriz	66711ab5b4	Merge pull request #3667 from CHOMPStation2/upstream-merge-12211 ... [MIRROR] Fixes Ghost Sight being missing from Preference verbs	2022-02-16 14:10:19 -07:00
Razgriz	21597607bc	Merge pull request #3666 from Holdelta/bestdrink ... Pilk	2022-02-16 14:10:02 -07:00
CHOMPStation2	8724bdf91c	Adds lollipops to Nanomed	2022-02-16 07:21:04 +00:00
Casey	b7aa2aa83e	Merge pull request #12241 from Heroman3003/lollipops ... Adds lollipops to Nanomed	2022-02-16 07:21:04 +00:00
Razgriz	1a817972a5	Merge pull request #3680 from CHOMPStation2/upstream-merge-12227 ... [MIRROR] Absorb Languages	2022-02-14 08:46:26 -07:00
CHOMPStation2	f140fe741b	Absorb Languages	2022-02-14 05:28:34 +00:00
Casey	07ab730aa7	Merge pull request #12227 from Very-Soft/absorblangs ... Absorb Languages	2022-02-14 05:28:33 +00:00
Razgriz	ce1f1702ea	Merge pull request #3679 from BlackMajor/patch-13 ... Fixes communicator watches breaking gun reloading	2022-02-13 21:48:07 -07:00
BlackMajor	0c942396f8	Update communicator.dm	2022-02-14 15:23:12 +13:00
BlackMajor	27fe631dd3	Update mercs_ch.dm	2022-02-14 15:01:07 +13:00
Casey	6af0ccde8f	Item bank tweak!	2022-02-14 01:03:57 +00:00
CHOMPStation2	a280f895a8	Uncapitalize curious crystal	2022-02-14 00:00:46 +00:00
Casey	c99308895a	Merge pull request #12222 from Very-Soft/tinyedit ... Uncapitalize curious crystal	2022-02-14 00:00:46 +00:00
CHOMPStation2	9643431501	[MIRROR] Initialize engine_loader landmark immediately	2022-02-13 21:58:57 +00:00
Casey	3471313ef0	Merge pull request #11897 from VOREStation/upstream-merge-8354 ... [MIRROR] Initialize engine_loader landmark immediately	2022-02-13 21:58:57 +00:00
CHOMPStation2	884d2f1e64	removes a CC teleport avenue	2022-02-13 21:50:32 +00:00
Casey	df9db6b34a	Merge pull request #12217 from Detective-Google/patch-1 ... removes a CC teleport avenue	2022-02-13 21:50:32 +00:00
CHOMPStation2	b12057ff62	No Quantum Pads on Shuttles	2022-02-13 21:50:23 +00:00
Casey	fc604df1c1	Merge pull request #12218 from Very-Soft/noqpadsonshuttls ... No Quantum Pads on Shuttles	2022-02-13 21:50:23 +00:00
CHOMPStation2	2f21a6da80	[MIRROR] Fixes literally everything dismantling walls	2022-02-13 21:49:06 +00:00
Casey	61bb814d7b	Merge pull request #12087 from VOREStation/upstream-merge-8371 ... [MIRROR] Fixes literally everything dismantling walls	2022-02-13 21:49:06 +00:00
CHOMPStation2	756c1d8a13	[MIRROR] Cybernetic Augments and Sick Tats	2022-02-13 21:48:53 +00:00
Casey	d4c693378d	Merge pull request #12210 from VOREStation/upstream-merge-8200 ... [MIRROR] Cybernetic Augments and Sick Tats	2022-02-13 21:48:53 +00:00
CHOMPStation2	81d2a13ed1	Admin resize adjustments	2022-02-13 12:22:21 +00:00
Casey	42df3abc43	Merge pull request #12212 from Very-Soft/resizetime ... Admin resize adjustments	2022-02-13 12:22:20 +00:00
CHOMPStation2	a464c46af8	Fixes Ghost Sight being missing from Preference verbs	2022-02-13 12:07:44 +00:00
Casey	1c87f56fc5	Merge pull request #12211 from Heroman3003/sightfix ... Fixes Ghost Sight being missing from Preference verbs	2022-02-13 12:07:44 +00:00
Razgriz	23bff588e7	Merge pull request #3663 from CHOMPStation2/upstream-merge-12208 ... [MIRROR] Tether passage blockades	2022-02-13 01:46:04 -07:00