6321 Commits

Author	SHA1	Message	Date
Razgriz	33090cc00a	Merge pull request #1815 from CHOMPStationBot/upstream-merge-10157 ... [MIRROR] Adminbus Update	2021-04-21 21:24:09 -07:00
Chompstation Bot	d21a54ad80	Adminbus Update	2021-04-15 23:56:20 +00:00
Shadowfire	71daa80a80	Implants and Mechs from a dispenser? Oh my! ... Added prizes to casino, and also small rework for streamlining of ckey work. Poor Kassc has to spend hours adding hundreds of items for you guys to enjoy after these casino events!	2021-04-15 01:14:06 +02:00
Nadyr	50fbbb63dc	Merge branch 'master' into upstream-merge-10122	2021-04-11 22:43:47 -04:00
Nadyr	505e47fc3a	Merge pull request #1784 from CHOMPStationBot/upstream-merge-10115 ... [MIRROR] [MIRROR] Exploration Medical Voidsuit	2021-04-11 22:37:17 -04:00
Novacat	d91ec5f6c1	Merge pull request #10116 from VOREStation/upstream-merge-8023 ... [MIRROR] Boda Tweaks and Russian Drinks V2	2021-04-10 14:32:12 +00:00
Chompstation Bot	1f330ac540	EMV: VR Edition	2021-04-10 13:54:24 +00:00
Chompstation Bot	f73e198519	[MIRROR] Exploration Medical Voidsuit	2021-04-10 13:54:18 +00:00
Nadyr	5283d9f78c	Merge pull request #1769 from CHOMPStationBot/upstream-merge-10103 ... [MIRROR] Remove unnecessary 'signatures'	2021-04-09 02:53:14 -04:00
Nadyr	7372e6cd14	Update vending_machines_vr.dm	2021-04-09 02:31:23 -04:00
Novacat	939e4fdecf	Merge pull request #10102 from Novacat/nova-ert ... Fixes two bugs	2021-04-08 21:06:56 +00:00
Chompstation Bot	588179bd66	Remove unnecessary 'signatures'	2021-04-08 16:48:30 +00:00
Nadyr	1c6390c1e3	Merge pull request #1706 from CHOMPStationBot/upstream-merge-10046 ... [MIRROR] [MIRROR] Tanning Tweaks	2021-04-02 23:29:50 -04:00
Razgriz	155a10336c	Update portable_turret.dm	2021-03-31 02:14:46 -07:00
Chompstation Bot	0001021815	[MIRROR] Tanning Tweaks	2021-03-30 20:55:26 +00:00
Nadyr	8019cd3421	Merge pull request #1386 from CHOMPStationBot/upstream-merge-9445 ... [MIRROR] [MIRROR] Department and Round Goals	2021-03-30 03:46:36 -04:00
Nadyr	2d6c3c92e6	Merge branch 'master' into upstream-merge-9632	2021-03-30 02:41:50 -04:00
Nadyr	70c292debf	Merge pull request #1695 from CHOMPStationBot/upstream-merge-10036 ... [MIRROR] Makes modifying ID cards not change the department if rank wasn't changed	2021-03-30 01:54:58 -04:00
Nadyr	a777f6993d	Merge branch 'master' into upstream-merge-10025	2021-03-30 00:58:05 -04:00
Novacat	977e492f60	Merge pull request #10036 from Heroman3003/department-preserve ... Makes modifying ID cards not change the department if rank wasn't changed	2021-03-29 13:43:56 +00:00
Nadyr	81d55a1cb2	Merge pull request #1682 from MisterGrimm/Genaprawns ... Player Xenomorph Overhaul 1.1 , the Genaprawns	2021-03-28 21:53:36 -04:00
Chompstation Bot	1ad694dcf0	[MIRROR] Repathed/renamed seromi to teshari.	2021-03-28 21:33:04 +00:00
Razgriz	767516aea5	Update vending_machines_vr.dm	2021-03-28 02:17:17 -07:00
Razgriz	f92a9c355c	Update vending_machines_vr.dm	2021-03-28 01:16:00 -07:00
Razgriz	ea8b1c45b4	Remove duplicate bullshit ... why	2021-03-28 01:02:59 -07:00
Nadyr	8c01fbb78d	Merge pull request #1655 from CHOMPStationBot/upstream-merge-9989 ... [MIRROR] [MIRROR] New ID Card Design	2021-03-27 21:52:28 -04:00
Sym	8ca11f0439	Changing player Xenomorphs to Genaprawns	2021-03-26 19:42:08 -04:00
Nadyr	4ce40dad53	Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 ... [MIRROR] [MIRROR] Added think-tanks.	2021-03-26 03:50:02 -04:00
Chompstation Bot	abc800056c	[MIRROR] New ID Card Design	2021-03-23 16:15:59 +00:00
Verkister	1a1756c28a	Non-broken PR for despawner gorepods ... Mirrorbot committed a fucky wucky	2021-03-21 20:26:33 +02: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
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
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	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	6e171d3182	Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 ... [MIRROR] [MIRROR] Matter Matters	2021-03-16 22:22:28 -07:00
Razgriz	401784f3e8	Merge branch 'master' into upstream-merge-9445	2021-03-10 17:59:32 -07: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
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	604b71d59b	Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620 ... [MIRROR] [MIRROR] Industrial Expansion	2021-03-10 01:05:16 -05:00
Nadyr	76691e0cfc	Update prisoner.dm	2021-03-10 00:18:57 -05:00
Novacat	1c75b72b58	Merge pull request #9871 from VOREStation/upstream-merge-7938 ... [MIRROR] The Arcade Machine Update	2021-03-10 00:04:05 +00:00
Chompstation Bot	5a70c39b08	[MIRROR] Lobby Improvements	2021-03-09 22:32:57 +00:00
Chompstation Bot	1114327254	[MIRROR] Ports TGUI Security Stuff	2021-03-09 22:18:36 +00:00
Chompstation Bot	b85e9fc4d9	[MIRROR] Industrial Expansion	2021-03-09 21:53:03 +00:00
Chompstation Bot	9270659dbb	[MIRROR] Matter Matters	2021-03-09 20:42:39 +00:00
cadyn	fc25da825e	Revert "Fix ghost double comms with new link allinone"	2021-03-05 14:00:51 -08:00
cadyn	4eb09d8e56	Merge pull request #1488 from CHOMPStation2/cadyn-patch-10 ... Fix ghost double comms with new link allinone	2021-03-04 01:04:50 -08:00