26518 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
PsiOmegaDelta	34ad83baae	Removes debug proc. ... It isn't needed.	2015-08-03 09:31:40 +02:00
PsiOmegaDelta	998b72bcd8	Fixes #10372. ... Removes snowflake attack code.	2015-08-03 09:20:36 +02:00
Atlantis	ad45e5d16b	Implements req_one_access for bots, as per request on GitHub discussion.	2015-08-02 23:23:18 +02:00
mwerezak	8f4394266b	Fixes not being able to insert a complete stack into the protolathe ... The call order meant that if you tried to insert a complete stack, use() would qdel the stack causing do_after() to fail.	2015-08-02 00:26:30 -04:00
mwerezak	2f20f0c537	Fixes #10249 ... Moves the isrobot() check so that it only applies to robots interacting with doors to open them.	2015-08-02 00:02:33 -04:00
mwerezak	0ceb0e291d	Fixes #10314 ... Replaces every check for a hardcoded material stack type with a check for material of the stack.	2015-08-02 00:01:10 -04:00
mwerezak	e3609bac94	Adds common proc to obtain the material of an object ... Adds a common get_material() proc to objects, and implements overrides where applicable	2015-08-01 23:03:21 -04:00
PsiOmegaDelta	0be3ae5b57	Merge pull request #10401 from PsiOmegaDelta/dev ... Dev	2015-08-01 19:50:23 +02:00
PsiOmega	8679887b17	Code relocation.	2015-08-01 19:46:35 +02:00
PsiOmega	f8d86900a5	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/modules/mob/new_player/preferences_setup.dm code/setup.dm	2015-08-01 19:45:42 +02:00
PsiOmegaDelta	f8799035f4	Merge pull request #10400 from Baystation12/master ... Master -> Dev-Freeze	2015-08-01 19:44:22 +02:00
mwerezak	f2bfc5a720	Merge pull request #10397 from Zuhayr/dev-freeze ... Fixes	2015-08-01 13:02:23 -04:00
mwerezak	b5e503c2ff	Merge pull request #10399 from GinjaNinja32/callproc ... Change callproc to check validity earlier	2015-08-01 12:24:13 -04:00
GinjaNinja32	495f80fff6	Change callproc to check validity earlier ... Callproc now checks validity of a call *before* prompting for arguments, instead of after, and can now check the validity of global (/proc/foo) procs.	2015-08-01 17:19:36 +01:00
Zuhayr	71433e024d	Merge pull request #10388 from mwerezak/light-suit ... Cybersuit and sprite fixes	2015-08-02 01:13:46 +09:30
Zuhayr	840b5b756b	Fixes #10358, #10359 and #10257	2015-08-01 23:17:27 +09:30
Zuhayr	2a51b778d6	Fixes #9611	2015-08-01 21:10:48 +09:30
GinjaNinja32	3888bd319b	Merge pull request #10396 from Mloc/revertchinsky ... revert chargen rendering rework	2015-08-01 11:50:56 +01:00
Mloc	f04ca77bfb	revert chargen rendering rework ... fixes #9733 Signed-off-by: Mloc <colmohici@gmail.com>	2015-08-01 11:35:53 +01:00
Zuhayr	f25fd2a339	Merge pull request #10395 from GinjaNinja32/holofix ... Holodeck fix	2015-08-01 19:22:47 +09:30
GinjaNinja32	41a75e330a	Holodeck fix	2015-08-01 09:39:29 +01:00
HarpyEagle	924d8fac74	Adds nightvision to cult constructs	2015-07-31 16:33:07 -04:00
mwerezak	29a8cb758b	Fixes #10380 ... Adds icon state for the service radio encryption key.	2015-07-31 14:41:33 -04:00
mwerezak	b0434d90b2	Adds stealth rig sprites ... Adds sprites for the stealth rig, so that people don't mix it up with the ninja. Helmet is different (based on swat mask and NVGs), everything else is a copy of the ninja suit.	2015-07-31 14:41:32 -04:00
mwerezak	1bfa4da870	Fixes #10315 ... The cybersuit is no longer space-proof. In exchange, it has a few more modules, built-in insulated gloves, and grippy shoes.	2015-07-31 14:41:31 -04:00
Zuhayr	82152daa30	Merge pull request #10393 from Baystation12/dev-freeze ... Dev freeze	2015-07-31 18:59:03 +09:30
PsiOmegaDelta	75920431e8	Merge pull request #10386 from mwerezak/antag-fix ... Fixes #10309	2015-07-31 10:26:14 +02:00
PsiOmegaDelta	874f3af8a9	Merge pull request #10392 from PsiOmegaDelta/dev ... Dev	2015-07-31 10:17:27 +02:00
PsiOmegaDelta	7e6cb6f38c	Compilation/definition fixes.	2015-07-31 10:05:42 +02:00
PsiOmegaDelta	353f685339	Moves code to relevant define.	2015-07-31 10:00:34 +02:00
PsiOmegaDelta	c28b3721b4	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/_helpers/unsorted.dm code/modules/clothing/glasses/glasses.dm code/modules/mob/living/carbon/human/life.dm code/setup.dm	2015-07-31 10:00:16 +02:00
PsiOmegaDelta	6663f02b29	Merge pull request #10391 from PsiOmegaDelta/dev-freeze ... Dev freeze	2015-07-31 09:54:52 +02:00
PsiOmegaDelta	2a9194b807	Updates changelog.	2015-07-31 09:48:42 +02:00
PsiOmegaDelta	3c9dc10746	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/game/gamemodes/cult/runes.dm	2015-07-31 09:48:15 +02:00
Zuhayr	4e462d14c2	Merge pull request #10390 from mwerezak/night-vision ... Fixes #10389	2015-07-31 16:19:09 +09:30
mwerezak	47d30a49a0	Fixes #10389 ... Allows glasses to set the see_invisible of their wearer.	2015-07-31 01:33:43 -04:00
Zuhayr	485a3bb122	Merge pull request #10385 from Mloc/spongedead ... fixes #10374	2015-07-31 13:57:32 +09:30
HarpyEagle	7feaf13d81	Fixes #10309 ... Antag types with ANTAG_OVERRIDE_JOB are finalized before jobs are handed out, based on the idea that something which replaces a player's job should not need to depend on their assigned job in any way. Moves the selection of pending antags outside of can_start(). Fixes issue with antag distribution that occurs when a player is a candidate for multiple antagonist types.	2015-07-30 22:28:17 -04:00
Mloc	8578c08236	fixes #10374 ... Signed-off-by: Mloc <colmohici@gmail.com>	2015-07-30 22:46:54 +01:00
Zuhayr	43083062c7	Merge pull request #10384 from Mloc/freezyfixes ... fix	2015-07-31 05:58:14 +09:30
Mloc	b727de8398	anchored and unsimulated objects are no longer considered for airflow ... Signed-off-by: Mloc <colmohici@gmail.com>	2015-07-30 21:00:42 +01:00
Zuhayr	ca7bd926d8	Merge pull request #10383 from Mloc/freezyfixes ... dview + airflow fixes	2015-07-31 04:39:04 +09:30
Mloc	cfac670cb6	anchored and unsimulated objects are no longer considered for airflow ... Signed-off-by: Mloc <colmohici@gmail.com>	2015-07-30 19:51:11 +01:00
Mloc	ac5774c81c	some dview tweaks & fixes ... Signed-off-by: Mloc <colmohici@gmail.com>	2015-07-30 19:50:32 +01:00
Zuhayr	ad63247749	Merge pull request #10382 from Mloc/freezyfixes ... fixes	2015-07-31 03:55:34 +09:30
Mloc	2622801d69	Merge pull request #10342 from atlantiscze/radio-fix ... Radio fixes	2015-07-30 19:25:24 +01:00
Mloc	64e5b6e50a	Merge pull request #10343 from GinjaNinja32/communicate-logging ... Adds a log_and_message_admins call to cult communication rune	2015-07-30 19:25:05 +01:00
Mloc	8cf9e32c2e	Merge pull request #10361 from atlantiscze/tiny-little-logspammers ... Fixes #10356	2015-07-30 19:24:24 +01:00
Mloc	6ef93d6613	Merge pull request #10370 from mwerezak/wounds ... Fixes wound max_bleeding_stage oddness	2015-07-30 19:24:13 +01:00
Mloc	ce11a6b516	Merge pull request #10379 from Karolis2011/dev-freeze ... Fix for invisible tagger pipes	2015-07-30 19:23:33 +01:00