9414 Commits

Author	SHA1	Message	Date
Nadyr	b5566ff403	Merge pull request #1914 from CHOMPStationBot/upstream-merge-10268 ... [MIRROR] Adds a big batch of mobs to maint pred pool	2021-05-09 07:47:25 -04:00
Nadyr	e0f6cb84c9	Merge branch 'master' into upstream-merge-10050	2021-05-09 06:13:32 -04:00
Nadyr	1f33d5696f	Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236 ... [MIRROR] Toys expansion	2021-05-08 23:50:05 -04:00
Chompstation Bot	78593f1c11	Adds a big batch of mobs to maint pred pool	2021-05-09 01:37:07 +00:00
Nadyr	65946e5c49	Update misc.dm	2021-05-08 08:36:11 -04:00
Nadyr	c1e068bd90	Update toys_vr.dm	2021-05-08 08:29:58 -04:00
Nadyr	375167cd63	Merge pull request #1907 from CHOMPStationBot/upstream-merge-10178 ... [MIRROR] New belt items	2021-05-08 08:11:11 -04:00
Aronai Sieyes	93124538dd	Merge pull request #10178 from dwinters99/light-replacer ... New belt items	2021-05-06 17:58:51 +00:00
Novacat	3245498530	Merge pull request #10236 from dwinters99/toys ... Toys expansion	2021-05-06 14:42:49 +00:00
Chompstation Bot	55cb88b4a9	[MIRROR] Ported the Bay/Nebula emote system.	2021-05-05 18:45:31 +00:00
Razgriz	ad16d9629b	Merge pull request #1857 from CHOMPStationBot/upstream-merge-10210 ... [MIRROR] Exploration Balance Tweaks	2021-04-30 19:36:55 -07:00
Chompstation Bot	fd5b2f094f	[MIRROR] Moves material stacks to modules/materials	2021-04-28 16:38:58 +00:00
Chompstation Bot	2d30c1c04e	Exploration Balance Tweaks	2021-04-26 18:14:21 +00:00
Razgriz	0a912847fc	Merge pull request #1834 from CHOMPStationBot/upstream-merge-10183 ... [MIRROR] [MIRROR] Random spawner refactor.	2021-04-21 21:45:26 -07:00
Razgriz	97140d5311	Merge pull request #1832 from CHOMPStationBot/upstream-merge-10175 ... [MIRROR] Changes blueprints to use ChangeArea	2021-04-21 21:45:13 -07:00
Novacat	0e2ecee8a7	Merge pull request #10183 from VOREStation/upstream-merge-8034 ... [MIRROR] Random spawner refactor.	2021-04-21 06:30:26 +00:00
Novacat	d25749a8b3	Merge pull request #10175 from Novacat/nova-ert ... Changes blueprints to use ChangeArea	2021-04-20 22:41:11 +00:00
Chompstation Bot	2856028342	Captain's Rapier	2021-04-20 16:50:56 +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
Darlantan	6806e7d9b5	Implanter, raccoons	2021-04-13 04:31:10 -04:00
Novacat	93b480e5fb	Merge pull request #10149 from Novacat/nova-ert ... Replaces old pilot helmets	2021-04-13 02:39:37 +00:00
Chompstation Bot	588179bd66	Remove unnecessary 'signatures'	2021-04-08 16:48:30 +00:00
Chompstation Bot	76e61abca6	tram+station take 2	2021-04-05 05:30:18 +00:00
Chompstation Bot	413bafbb91	Some minor mapfixes	2021-04-03 02:40:33 -04:00
Nadyr	4cbf330a93	Merge branch 'master' into upstream-merge-10055	2021-04-03 00:25:44 -04: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	e9cfca5370	Update misc_vr.dm	2021-03-31 02:18:45 -07:00
Chompstation Bot	088d05245d	[MIRROR] Tesh gliding tweaks.	2021-03-31 09:14:30 +00:00
Razgriz	3cba6aaab2	Update intercom.dm	2021-03-30 17:40:07 -07:00
Chompstation Bot	0001021815	[MIRROR] Tanning Tweaks	2021-03-30 20:55:26 +00:00
Nadyr	4307a692e8	Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032 ... [MIRROR] Adminbus Area Modifications	2021-03-30 04:00:25 -04:00
Nadyr	452671247c	Update trash_pile_vr.dm	2021-03-30 02:54:11 -04:00
Nadyr	9e24887a57	Update weldbackpack_ch.dm	2021-03-30 01:33:29 -04:00
Nadyr	a777f6993d	Merge branch 'master' into upstream-merge-10025	2021-03-30 00:58:05 -04:00
Chompstation Bot	337acaa851	Adminbus Area Modifications	2021-03-29 17:22:38 +00:00
Nadyr	c0fd1e030b	Merge pull request #1693 from CHOMPStationBot/upstream-merge-10029 ... [MIRROR] MORE ALT ID STUFF	2021-03-28 22:19:31 -04:00
Nadyr	e9ff8803ae	Update station_ids_vr.dm	2021-03-28 22:05:26 -04: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	149f222644	MORE ALT ID STUFF	2021-03-28 23:59:28 +00:00
Chompstation Bot	1ad694dcf0	[MIRROR] Repathed/renamed seromi to teshari.	2021-03-28 21:33:04 +00:00
Nadyr	3c692ed159	Merge branch 'master' into upstream-merge-10018	2021-03-28 00:05:29 -04:00
Nadyr	9de40aacb1	Merge pull request #1667 from CHOMPStationBot/upstream-merge-10016 ... [MIRROR] Adds alternative ID cards!	2021-03-27 23:50:28 -04:00
Nadyr	f6049a256a	Merge branch 'master' into upstream-merge-10007	2021-03-27 23:13:57 -04:00
Nadyr	ace9beb3d1	Delete id_stacks_deptname.dm	2021-03-27 22:59:17 -04:00
Nadyr	04f4302dfa	Delete id_stacks_cit.dm	2021-03-27 22:58:50 -04:00
Nadyr	a8e03b8061	Merge branch 'master' into upstream-merge-10008	2021-03-27 22:31:57 -04:00
Nadyr	2133df1507	Merge branch 'master' into upstream-merge-10002	2021-03-27 22:03:57 -04: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	e98859942f	Merge branch 'master' into upstream-merge-9974	2021-03-26 03:57:31 -04:00