18596 Commits

Author	SHA1	Message	Date
Nadyr	4ce40dad53	Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 ... [MIRROR] [MIRROR] Added think-tanks.	2021-03-26 03:50:02 -04:00
Razgriz	13a9e0c94a	Update event_vr.dm	2021-03-24 23:05:42 -07:00
Razgriz	5e18aaed38	Event update ... Fixes Gravity event. Also adds landmarks to the map that enables the maints pred event.	2021-03-24 23:03:24 -07:00
Novacat	0a0440ed9c	Merge pull request #10001 from Novacat/nova-basicfixes ... Technomancer Fixes	2021-03-23 20:01:01 +00:00
Razgriz	9a6cf3191f	Merge pull request #1640 from Verkister/patch-3 ... Non-broken PR for despawner gorepods	2021-03-22 01:16:45 -07:00
Novacat	9c209652a9	Merge pull request #9988 from VOREStation/upstream-merge-7973 ... [MIRROR] News Update + Communicator Lag Fix	2021-03-21 21:25:45 +00:00
Verkister	1a1756c28a	Non-broken PR for despawner gorepods ... Mirrorbot committed a fucky wucky	2021-03-21 20:26:33 +02:00
Nadyr	5e99c01097	Merge pull request #1618 from CHOMPStationBot/upstream-merge-9961 ... [MIRROR] [MIRROR] Fixes Global and Fixes Eyes	2021-03-21 05:06:41 -04:00
Nadyr	29d7bd704f	Merge pull request #1624 from CHOMPStationBot/upstream-merge-9958 ... [MIRROR] [MIRROR] Clicking on turfs while dragging something no longer closes the door	2021-03-21 04:54:56 -04:00
Nadyr	de07a4e79d	Merge branch 'master' into upstream-merge-9961	2021-03-21 04:34:39 -04:00
Nadyr	c8321a53df	Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960 ... [MIRROR] [MIRROR] Added Doctress' Jager drink.	2021-03-21 04:31:54 -04:00
Chompstation Bot	2a5c21c8f5	[MIRROR] Kaleidoscope 2: The Retabbening	2021-03-21 01:24:14 -04:00
Razgriz	d834f66316	Merge pull request #1600 from CHOMPStationBot/upstream-merge-9935 ... [MIRROR] Fixes bug with entertainer	2021-03-19 22:52:53 -07:00
Razgriz	202651b317	Merge pull request #1629 from CHOMPStationBot/upstream-merge-9973 ... [MIRROR] [MIRROR] Makes custom cigarettes even more custom-ier	2021-03-19 22:44:13 -07:00
Razgriz	e854e7d8ce	Merge pull request #1620 from CHOMPStationBot/upstream-merge-9968 ... [MIRROR] [MIRROR] GPS presentation/update tweaks/fixes.	2021-03-19 22:41:29 -07:00
Razgriz	85c7437fec	Merge pull request #1615 from CHOMPStationBot/upstream-merge-9966 ... [MIRROR] [MIRROR] adds ticket redemption	2021-03-19 22:39:40 -07:00
Razgriz	20ec413da2	Accept upstream changes, remove YW job adds ... Lets hope this works and doesn't affect anything. We don't use the YW jobs.	2021-03-19 22:35:25 -07:00
Razgriz	9149a7bce6	Merge pull request #1599 from CHOMPStationBot/upstream-merge-9930 ... [MIRROR] Slightly nerfs cold adaptation and Technomancer logging changes	2021-03-19 22:31:05 -07:00
Novacat	a4bf657c59	Merge pull request #9973 from VOREStation/upstream-merge-7925 ... [MIRROR] Makes custom cigarettes even more custom-ier	2021-03-19 07:48:42 +00:00
Chompstation Bot	b7b8682e7c	[MIRROR] Added think-tanks.	2021-03-18 14:57:26 +00:00
Novacat	d468ae34f5	Merge pull request #9958 from VOREStation/upstream-merge-7968 ... [MIRROR] Clicking on turfs while dragging something no longer closes the door	2021-03-18 14:41:58 +00:00
Novacat	46506f23de	Merge pull request #9968 from VOREStation/upstream-merge-7980 ... [MIRROR] GPS presentation/update tweaks/fixes.	2021-03-18 14:40:23 +00:00
Chompstation Bot	07dcf04408	[MIRROR] Fixes Global and Fixes Eyes	2021-03-18 14:40:07 +00:00
Novacat	f2fc4c8be7	Merge pull request #9960 from VOREStation/upstream-merge-7974 ... [MIRROR] Added Doctress' Jager drink.	2021-03-18 14:40:00 +00:00
Novacat	ffe0908dfe	Merge pull request #9966 from VOREStation/upstream-merge-7985 ... [MIRROR] adds ticket redemption	2021-03-18 14:38:42 +00:00
Razgriz	5c285eda7d	Merge pull request #1595 from ZVB334/Weldpackfix ... Fixes Teshari Welderbackpack Sprite	2021-03-17 03:33:50 -07:00
Razgriz	6e171d3182	Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 ... [MIRROR] [MIRROR] Matter Matters	2021-03-16 22:22:28 -07:00
Chompstation Bot	402091a16e	Fixes bug with entertainer	2021-03-13 00:19:54 +00:00
Novacat	fea37c84c3	Merge pull request #9930 from Novacat/nova-basicfixes ... Slightly nerfs cold adaptation	2021-03-12 23:22:55 +00:00
ZVB334	4baf7186fd	Fixes Teshari Welderbackpack Sprite	2021-03-12 11:20:26 -06:00
Nadyr	b9b094eed0	Merge pull request #1576 from CHOMPStationBot/upstream-merge-9909 ... [MIRROR] Fixes fighters being so slow	2021-03-12 01:56:09 -05:00
Nadyr	c6d02615d7	Merge pull request #1574 from CHOMPStationBot/upstream-merge-9913 ... [MIRROR] Adds a new maint pred mob	2021-03-12 01:48:23 -05:00
Nadyr	57b6444745	Merge pull request #1568 from CHOMPStationBot/upstream-merge-9904 ... [MIRROR] Updates the _vr recipies to include copper	2021-03-12 01:10:27 -05:00
Nadyr	62e293b890	Merge pull request #1557 from CHOMPStationBot/upstream-merge-9894 ... [MIRROR] [MIRROR] Adds an advanced version of the mining drill scanner.	2021-03-12 00:05:38 -05:00
Novacat	a2e3140cb6	Merge pull request #9909 from Novacat/nova-basicfixes ... Fixes fighters being so slow	2021-03-11 14:48:38 +00:00
Novacat	9645893750	Merge pull request #9913 from Heroman3003/sect-drone ... Adds a new maint pred mob	2021-03-11 14:48:27 +00:00
Nadyr	9be6ad7774	Merge pull request #1562 from CHOMPStationBot/upstream-merge-9897 ... [MIRROR] [MIRROR] Tweaked implant loadout, refactored implant detection.	2021-03-11 00:52:13 -05:00
Nadyr	75e18cc9b7	Merge pull request #1555 from CHOMPStationBot/upstream-merge-9889 ... [MIRROR] [MIRROR] E-cigarette improvements	2021-03-11 00:41:52 -05:00
Nadyr	1fa9bbb85c	Merge pull request #1558 from CHOMPStationBot/upstream-merge-9895 ... [MIRROR] Fixes Industrial Expansion	2021-03-11 00:38:56 -05:00
Razgriz	93a023364e	Merge pull request #1553 from kcin2001/fix-fitness ... fixes alt title filename so it actually loads over others and includes it	2021-03-10 22:09:03 -07:00
Chompstation Bot	d2e828454f	Updates the _vr recipies to include copper	2021-03-10 20:46:03 +00:00
Novacat	4631c4faca	Merge pull request #9897 from VOREStation/upstream-merge-7963 ... [MIRROR] Tweaked implant loadout, refactored implant detection.	2021-03-10 19:40:33 +00:00
Novacat	b6d583cbab	Merge pull request #9895 from Novacat/nova-basicfixes ... Fixes Industrial Expansion	2021-03-10 19:27:55 +00:00
Chompstation Bot	4c8dab8a21	[MIRROR] Adds an advanced version of the mining drill scanner.	2021-03-10 19:17:39 +00:00
Novacat	9098ecbda9	Merge pull request #9889 from VOREStation/upstream-merge-7949 ... [MIRROR] E-cigarette improvements	2021-03-10 19:07:18 +00:00
kcin2001	6b64faace0	fixes alt title filename so it actually loads over others and includes it ... also moves the other chompstation additions to the file because thats how i was told to add new job titles, if someone wants to fite me then fite me	2021-03-10 03:11:08 -08:00
Nadyr	d94e59feea	Merge pull request #1548 from CHOMPStationBot/upstream-merge-9871 ... [MIRROR] [MIRROR] The Arcade Machine Update	2021-03-10 01:48:25 -05:00
Nadyr	da9dc5e71d	Merge pull request #1542 from CHOMPStationBot/upstream-merge-9773 ... [MIRROR] [MIRROR] Lobby Improvements	2021-03-10 01:44:24 -05:00
Nadyr	d6cab496ed	Merge pull request #1546 from CHOMPStationBot/upstream-merge-9867 ... [MIRROR] [MIRROR] Added a GPS compass.	2021-03-10 01:41:28 -05:00
Nadyr	dd5066a8e6	Merge pull request #1545 from CHOMPStationBot/upstream-merge-9815 ... [MIRROR] [MIRROR] Removes transform from speech bubbles when speaker is scaled at less than 2x.	2021-03-10 01:08:56 -05:00