1582 Commits

Author	SHA1	Message	Date
kevinz000	0615189629	Merge pull request #9665 from Ghommie/Ghommie-cit295 ... Removing references to national socialism	2019-11-03 06:18:47 -07:00
kevinz000	d9c38d0589	Merge pull request #8948 from Ghommie/Ghommie-cit156 ... Cleaning up the arousal module.	2019-10-31 17:27:03 -07:00
kevinz000	6dc6159f4a	Merge pull request #9578 from deathride58/mapsubsystemimprovements ... Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more	2019-10-29 21:42:32 -07:00
kevinz000	b172c5f691	Merge pull request #9501 from deathride58/stronksecborgs ... Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)	2019-10-29 21:29:12 -07:00
kevinz000	ae4aee794e	Merge pull request #9592 from Ghommie/Ghommie-cit262 ... Porting movespeed modification system updates.	2019-10-29 21:27:53 -07:00
kevinz000	bc3dd51db3	Merge pull request #9626 from Ghommie/Ghommie-cit278 ... Unmodularize space kiwis and banana spiders.	2019-10-29 21:21:14 -07:00
Ghommie	005c87bdf6	I'm making a joke title, don't ban me github.	2019-10-30 01:31:29 +01:00
BlackMajor	5894b148a8	Merge pull request #9636 from Ghommie/Ghommie-cit282 ... Gang dominator sprite update.	2019-10-29 10:36:50 +13:00
BlackMajor	6a7a121d56	Merge pull request #8856 from Citadel-Station-13/magrifles_again ... Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns	2019-10-28 16:47:02 +13:00
deathride58	2c017b1f86	Merge pull request #9633 from Citadel-Station-13/onionneck ... onion necklace	2019-10-27 20:43:01 -04:00
Ghommie	efdb850129	Gang dominator sprite update.	2019-10-27 23:59:40 +01:00
Jay	9d830610bb	onion necklace	2019-10-27 11:52:38 -05:00
Ghommie	bf92aa2ffb	Unmodularize MkII hyposprays and other reagent items sprites.	2019-10-26 19:14:28 +02:00
Ghommie	c0130467db	Unmodularize space kiwis and banana spiders.	2019-10-26 18:15:02 +02:00
deathride58	be4d694080	Merge pull request #9329 from Citadel-Station-13/kevinz000-patch-87 ... makes sprinting take more stamina when buffer is empty to compensate for added regen	2019-10-25 23:15:11 -04:00
kevinz000	49e52eee05	Merge pull request #9603 from Ghommie/Ghommie-cit267 ... Unmodularize lavaknights and emags.	2019-10-25 20:12:35 -07:00
kevinz000	08d139ee2c	Merge pull request #9608 from Ghommie/Ghommie-cit272 ... Unmodularize Eutactic Blades.	2019-10-25 20:11:01 -07:00
kevinz000	275ecbf468	Merge pull request #9604 from Ghommie/Ghommie-cit268 ... Unmodularize job types	2019-10-25 20:10:39 -07:00
kevinz000	4eca1ca5ad	Merge pull request #9605 from Ghommie/Ghommie-cit269 ... Unmodularize vox sounds	2019-10-25 20:09:52 -07:00
kevinz000	8b22c95479	Merge pull request #9606 from Ghommie/Ghommie-cit270 ... Unmodularize research.	2019-10-25 20:09:26 -07:00
kevinz000	9b7b2ce0b2	Merge pull request #9607 from Ghommie/Ghommie-cit271 ... Unmodularize events	2019-10-25 20:07:48 -07:00
Ghommie	ce0ba51b61	Fixing schlongs and death.	2019-10-25 12:52:32 +02:00
Ghommie	79c3700d25	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156	2019-10-25 12:42:28 +02:00
Ghommie	cb74be29ae	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262	2019-10-25 12:40:50 +02:00
Ghommie	c1f84da39e	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272	2019-10-25 12:26:17 +02:00
kevinz000	02a1aaea34	Merge pull request #9548 from Ghommie/Ghommie-cit251 ... Fixing radio emotes conflict with drunk memes.	2019-10-24 18:48:33 -07:00
kevinz000	2ae111eaf0	Merge pull request #9587 from Ghommie/Ghommie-cit258 ... Porting components updates and fixing phantom thief component.	2019-10-24 18:38:39 -07:00
kevinz000	9fd3ef7801	Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again	2019-10-24 18:36:04 -07:00
kevinz000	31f9ed9665	fixes	2019-10-24 15:31:45 -07:00
Ghommie	4b0b130c36	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272	2019-10-25 00:27:04 +02:00
Ghommie	85b35433b2	Unmodularize Eutactic Blades.	2019-10-25 00:14:38 +02:00
Ghommie	6fbe7f9086	unmodularize events	2019-10-24 23:41:31 +02:00
Ghommie	6f19899dd2	Unmodularize research.	2019-10-24 23:28:15 +02:00
Ghommie	0da6ae549f	Unmodularize vox sounds	2019-10-24 23:02:21 +02:00
Ghommie	f035d77b53	Slips.	2019-10-24 22:50:53 +02:00
Ghommie	2a07bf95d8	Unmodularize job types	2019-10-24 22:44:40 +02:00
Ghommie	f01b5c853f	Unmodularize lavaknights.	2019-10-24 22:08:36 +02:00
Ghommie	a50606bb67	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259	2019-10-24 10:10:07 +02:00
Ghommie	4c8d7023c5	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258	2019-10-24 09:50:20 +02:00
kevinz000	9d78d8a259	Merge branch 'master' into magrifles_again	2019-10-23 17:57:19 -07:00
deathride58	f85f110baa	Merge pull request #9047 from Poojawa/syntheticbloods ... RGB Blood Reworks + Blood generator	2019-10-23 20:54:55 -04:00
Ghommie	20d9adaccd	Floaty floating.	2019-10-23 20:43:05 +02:00
Ghommie	a95b13c24a	jetpack fixes too & co	2019-10-23 19:31:54 +02:00
Ghommie	e1928a18f1	Porting GetComponent macros removal, and some related changes.	2019-10-23 15:04:28 +02:00
Ghommie	ba307b01a5	Defib fixes and chem effects stuff	2019-10-23 13:45:57 +02:00
Ghommie	fc1f10c97f	Porting components updates and fixing phantom thief component.	2019-10-23 13:01:31 +02:00
deathride58	68813b6846	Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer	2019-10-22 19:14:12 -04:00
kevinz000	f96e1bbe33	lmao	2019-10-22 01:59:45 -07:00
Poojawa	6fc750dca0	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-10-21 19:13:19 -05:00
kevinz000	1d649c27de	Update robot_movement.dm	2019-10-21 14:38:38 -07:00