2540 Commits

Author	SHA1	Message	Date
Razgriz	4718e71c85	Merge pull request #5977 from Seris02/jellyfishnooo ... stops 'the space jellyfish bonks the window harmlessly. x1762'	2023-03-22 14:36:42 -07:00
Nadyr	e6c049ef47	Merge pull request #5970 from CHOMPStation2/upstream-merge-14676 ... [MIRROR] Mob tweaks and fixes	2023-03-20 01:50:02 -04:00
Seris02	08b5274a95	the jellyfish bonks the window harmlessly.x1762	2023-03-20 12:42:03 +08:00
Nadyr	2dda11b280	powder that makes you say yes	2023-03-19 08:56:21 -04:00
Casey	2e3d51e095	Merge pull request #14707 from Heroman3003/propvaredit ... Should fix props being un-var-editable	2023-03-18 21:01:44 +00:00
Casey	884f772c49	Mob tweaks and fixes	2023-03-18 20:56:26 +00:00
Heroman3003	d2543ddf47	Merge pull request #14678 from KillianKirilenko/kk-talontweaks ... Frozen Organ Crates	2023-03-17 21:05:28 +00:00
Nadyr	25ef364bd2	Merge pull request #5960 from CHOMPStation2/upstream-merge-14701 ... [MIRROR] Shuttle Bay signs	2023-03-17 04:03:28 -04:00
Nadyr	506661f8f4	Merge pull request #5919 from CHOMPStation2/upstream-merge-14551 ... [MIRROR] [MIRROR] /tg/ era language pass	2023-03-17 02:40:16 -04:00
Heroman3003	b333971955	Shuttle Bay signs	2023-03-17 01:06:16 +00:00
Heroman3003	025fac4bf9	[MIRROR] /tg/ era language pass	2023-03-13 05:23:57 +00:00
TheGreatKitsune	dc89ee8f88	Fixes crematoriums sometimes getting broken when opening	2023-03-11 22:34:53 -06:00
Nadyr	8f2312988b	Merge pull request #5807 from CHOMPStation2/upstream-merge-14566 ... [MIRROR] Makes SD wall lockers properly visible	2023-02-27 02:17:07 -05:00
Nadyr	34208c191b	Merge pull request #5785 from CHOMPStation2/upstream-merge-14547 ... [MIRROR] Ghost pod for debris POI moved into its own separate PR	2023-02-27 02:08:18 -05:00
Casey	594ec63a8b	Makes SD wall lockers properly visible	2023-02-26 18:10:04 +00:00
Razgriz	cef0668717	Merge pull request #5793 from CHOMPStation2/upstream-merge-14554 ... [MIRROR] [MIRROR] Safes Move Objects In Late Initialize.	2023-02-26 01:02:42 -07:00
Heroman3003	ab8361b3f3	Merge pull request #14554 from VOREStation/upstream-merge-8981 ... [MIRROR] Safes Move Objects In Late Initialize.	2023-02-26 00:52:29 +00:00
Heroman3003	916526893a	Merge pull request #14547 from Runa-Dacino/SurvivorPod ... Ghost pod for debris POI moved into its own separate PR	2023-02-25 03:04:16 +00:00
Heroman3003	993acbf556	Merge pull request #14534 from Heroman3003/art-paint-stuff ... Adjusts artistic crate orders	2023-02-25 03:01:42 +00:00
Casey	b82736dc53	Merge pull request #14504 from Very-Soft/misc_fixes ... Misc fixes	2023-02-17 19:32:51 +00:00
Razgriz	92d9cc3724	Add ticket printer to warden locker	2023-02-15 16:29:04 -07:00
Razgriz	492eb58400	Add ticket printer to HoS locker	2023-02-15 16:28:18 -07:00
Razgriz	fa3c94ace6	Add ticket printer to security locker	2023-02-15 16:27:09 -07:00
Razgriz	eb0909a6fb	Update HoS lockers 2nd deck	2023-02-12 17:28:05 -07:00
Heroman3003	450842aaec	Merge pull request #14428 from VOREStation/upstream-merge-8915 ... [MIRROR] allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes	2023-02-04 20:58:26 +00:00
Nadyr	708232d677	Merge pull request #5623 from CHOMPStation2/upstream-merge-14402 ... [MIRROR] [MIRROR] Tiny grammar tweaks	2023-02-02 20:50:59 -05:00
Novacat	e34a990b3c	Merge pull request #14411 from Cyantime/patch-2 ... Fixes #14409	2023-02-01 01:53:56 +00:00
Heroman3003	077834dd5c	[MIRROR] Tiny grammar tweaks	2023-01-30 08:51:26 +00:00
Nadyr	527fc4dacc	Merge pull request #5595 from CHOMPStation2/upstream-merge-14368 ... [MIRROR] Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly	2023-01-27 10:30:21 -05:00
BlackMajor	353f4e1cab	Merge branch 'master' into upstream-merge-14247	2023-01-25 14:01:30 +13:00
Razgriz	376b3e8906	powder that makes you say yes	2023-01-24 17:53:21 -07:00
Casey	e5a0753e45	Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly	2023-01-22 18:37:22 +00:00
Razgriz	9197e1b95d	Merge branch 'master' into upstream-merge-14220	2023-01-21 22:24:10 -07:00
Razgriz	418643dce3	unfucc exploration ... please do not the department	2023-01-21 22:21:39 -07:00
Verkister	604af27af9	also fixes that damn replicant window runtime rarr ... that line 183 above represents the feel of this shit messing up test runs and shit	2023-01-11 08:13:39 +02:00
Nadyr	d53b043ea7	Merge pull request #5508 from CHOMPStation2/upstream-merge-14301 ... [MIRROR] Fixes personal lockers robbing borgs of their modules	2023-01-04 21:17:36 -05:00
Nadyr	00edc849b5	Merge pull request #5479 from CHOMPStation2/upstream-merge-14269 ... [MIRROR] Adjusts events and refactors borgs a bit in process	2023-01-04 20:45:00 -05:00
Nadyr	b7ef4171c8	Merge pull request #5475 from CHOMPStation2/upstream-merge-14262 ... [MIRROR] Maint pred cancel tweak	2023-01-04 20:34:36 -05:00
Nadyr	7429a71bcb	powder that makes you say yes	2023-01-04 20:12:26 -05:00
Novacat	b1c7a73918	Merge pull request #14301 from Heroman3003/borgfix2 ... Fixes personal lockers robbing borgs of their modules	2023-01-04 13:40:35 +00:00
Heroman3003	e270d35320	Merge pull request #14264 from Heroman3003/chaircolors ... Fixes comfy chair colors	2022-12-30 21:05:16 +00:00
Heroman3003	21b9d0e636	Adjusts events and refactors borgs a bit in process	2022-12-30 21:05:11 +00:00
Heroman3003	c3d2148faa	Maint pred cancel tweak	2022-12-29 04:51:39 +00:00
Novacat	f0b2c95957	Merge pull request #14256 from Heroman3003/borg-low-wall ... Two borg fixes	2022-12-26 22:57:06 +00:00
Casey	754c0af3c3	Gives pilots their holdout back	2022-12-26 02:11:48 +00:00
Casey	764e792895	Remove the Exploration Department	2022-12-23 16:21:39 +00:00
Heroman3003	c502bad450	Merge pull request #14202 from VOREStation/upstream-merge-8859 ... [MIRROR] Greenjoe12345/xmas2022	2022-12-14 06:36:11 +00:00
Razgriz	034e6bd7b3	powder that rejects your reality and substitutes our own	2022-12-11 19:17:42 -07:00
Heroman3003	2e7c58bfa8	Merge pull request #14096 from Novacat/nova-basicfixes ... Trash pile adjustments	2022-11-21 04:34:16 +00:00
Casey	191657472b	Merge pull request #14066 from Heroman3003/sofix ... Hopefully fixes corner sofas	2022-11-13 20:47:59 +00:00