Commit Graph

203 Commits

Author SHA1 Message Date
Rob Nelson
ace34c60b0 DNA2: New powers from Paradise's release of Goon's genetic code. Also added lisp disability.
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	html/changelog.html
2014-01-20 02:10:58 -05:00
Rob Nelson
b5a1eff678 Add ghost radio
Conflicts:
	code/modules/client/preferences.dm
	code/world.dm
2014-01-17 13:10:00 -05:00
ZomgPonies
4f405f2ed7 A few numbers change for reagents 2014-01-11 01:51:31 -05:00
Zuhayr
f9b8c01c65 Implemented IS_SLOW. 2014-01-07 00:01:52 -05:00
Zuhayr
e09a00fe0e Fixed a duplicate definition bug with WHITELISTED.
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
2014-01-06 23:59:21 -05:00
Zuhayr
2c677b2e48 Reusing some unused flags in species.
Conflicts:
	code/setup.dm
2014-01-06 23:35:14 -05:00
ZomgPonies
af92092f64 Fixed Slimaggedon spawning -- Uses antag menu 2014-01-04 22:11:16 -05:00
Nanai
bf9ba0f658 Added and Adjusted Chemicals
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.

New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.

Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
2014-01-04 15:59:22 -05:00
ZomgPonies
3a88f33e0c Fixed up and re-added powerarmor 2013-12-28 17:21:25 -05:00
ZomgPonies
58afd403a9 Moving some defines over to setup 2013-12-28 08:58:12 -05:00
ZomgPonies
21666af24d Organ/Surgery Overhaul Part 2 2013-12-19 08:59:02 -05:00
ZomgPonies
87c56b4b23 Vampire commit 2 2013-12-14 05:19:54 -05:00
ZomgPonies
912601a30d Vampire Gamemode! 2013-12-13 19:38:49 -05:00
ZomgPonies
82104d9565 New Security Levels 2013-11-26 03:22:12 -05:00
ZomgPonies
227f4a1bc0 I guess slime people are now live. 2013-11-24 09:48:38 -05:00
ZomgPonies
29114f7bb3 Added appearance bans granularity option 2013-11-24 02:47:56 -05:00
ZomgPonies
0e201cc4a5 Going back to BS12 ZAS, permanently 2013-11-08 09:51:22 -05:00
ZomgPonies
0227baa319 Reverting ZAS back to /vg/ style 2013-11-07 07:13:27 -05:00
ZomgPonies
e4a82dfda8 ZAS switched from /vg/ to BS12 2013-11-06 20:21:59 -05:00
ZomgPonies
36c7fa3dcd computer3 merge 2013-11-03 14:18:54 -05:00
ZomgPonies
00b101d7f2 Seperated ID and PDA slots 2013-11-01 13:28:58 -04:00
ZomgPonies
6a073828f5 Slime people commits 2013-10-21 05:25:37 -04:00
ZomgPonies
b01b0c962f Slime people species 2013-10-20 20:19:05 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
771de60525 Optimizations and bugfixes galore 2013-10-08 10:32:47 -04:00
ZomgPonies
aa79d1323b Added Vox and Kidan as unlockable Karma species 2013-10-04 02:57:42 -04:00
ZomgPonies
f841903433 Antmen buff 2013-09-30 01:14:25 -04:00
ZomgPonies
e2826f3675 New Vox gamemode -- Trade 2013-09-28 20:42:32 -04:00
ZomgPonies
78f14f11cc New vending machine, enabling Ian clothes, bug fixes, map update 2013-09-28 01:38:18 -04:00
ZomgPonies
fcbdb53bbb Bunch of FAT fixes 2013-09-24 19:00:40 -04:00
ZomgPonies
c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Zuhayr
e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr
254cef453a Added a preferences switch for diona. 2013-08-13 14:16:07 -07:00
Zuhayr
6e81952c20 Moved language flag defines to setup.dm. 2013-08-10 21:00:32 -07:00
Zuhayr
e9a1272d34 Moved species defines to setup.dm, add whitelisted species global. 2013-08-07 01:12:11 -07:00
Zuhayr
e16d06d469 Merged setup.dm. 2013-07-28 08:46:10 -07:00
Zuhayr
0c88896adf Adds a vox heist game mode. Fairly complex. 2013-07-28 05:18:04 -07:00
Segrain
47db87fcfe Cameras for strike teams. 2013-07-28 01:59:03 +03:00
Segrain
914d072c86 Camera networks. 2013-07-28 00:58:18 +03:00
Zuhayr
b0d8ee7861 Merge resolution. 2013-07-26 23:17:48 -07:00
Segrain
fe0e1ecfb6 Conflict fix? 2013-07-25 09:55:35 +03:00
Segrain
a17e456a97 Defaulting LOOC to being toggled on. 2013-07-25 03:04:28 +03:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
comma
f1cfb96dab Fixes #3225. Adds separate toggle for LOOC.
Fixes #3285. Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
2013-07-10 22:39:27 +04:00
Spamcat
24eddd6eaa Now 100% more machinery! 2013-07-05 04:12:41 +04:00
Spamcat
6e61fe3914 Initial pulse code. WIP 2013-07-05 03:11:50 +04:00
Zuhayr
513a9d7ee8 Fixes #3052 2013-06-22 20:22:19 -07:00
MisterBook
a34174e124 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-05 18:39:43 -05:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30