Commit Graph

13989 Commits

Author SHA1 Message Date
Datraen
8e70e4e91a Merge pull request #709 from SinTwo/New_PDA_Sprites
New PDA Sprites
2016-01-02 23:29:36 -05:00
Datraen
c19d735e7b Adds more accesses to things. 2016-01-02 22:19:44 -05:00
Datraen
f3a60c054c Gives mods access to direct narrate. 2016-01-02 21:25:09 -05:00
Datraen
8f2d678b77 Merge pull request #722 from EmperorJon/03_Jan._Fix_blood_injection
Fixes #696 (IVs/Blood injection going to wrong place)
2016-01-02 20:39:37 -05:00
Jon
b918d7f676 Blood was going into the bloodstream reagents of the mob, not actually vessel bloodstream as it were. A check was in place that mobs which required a heart did this, whereas the actual check should have been mobs that didn't require a heart. In other words, if you're some sort of species that doesn't have a heart, having blood put into you should put it in however you explain the "bloodstream" reagent container as opposed to actually increasing the mob's blood count. 2016-01-03 00:43:35 +00:00
PsiOmegaDelta
2e89b7c718 Fixes the canUnEquip() proc.
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
2016-01-02 16:59:16 +01:00
Hubblenaut
f4fe6daf3d Adds sugar dispensers 2016-01-02 15:32:51 +01:00
Hubblenaut
e5de78b647 Adds coffee dispenser 2016-01-02 15:32:48 +01:00
Zuhayr
447d0e74ce Added a colour selector to the floor painter, added the floor painter to the construction and drone modules. 2016-01-02 07:05:45 +10:30
PsiOmegaDelta
4ed1e118fc Merge pull request #11861 from Baystation12/master
Dev-freeze
2016-01-01 13:14:21 +01:00
woodratt
300cafd987 1.4.0 Fire extinguishe fixes and tweaks
- Tweaks the amount that fire extinguisher holds and particles they send out. According to Spookerton there's no advantage to having more than 3 particles. In tests this seems to be the case as well.
- Also a minor edit to the code for patting people out that are on fire (as suggested by Spookerton), should help with folks that get set on fire.
- Added more fire extinguishers through medical.

-- One note -- Found in testing the fire extinguishers, water on tiles does not go away over time. Fire extinguishers appear to spray water on the tiles. Didn't know a way around this or how to fix this.
2015-12-31 20:57:18 -08:00
Neerti
fd3b91650f Merge pull request #711 from Zuhayr/polfix
May fix massive lag issues with autofire guns.
2015-12-31 21:12:12 -05:00
Zuhayr
3044496ae9 Attempting to limit object checks. 2016-01-01 12:25:30 +10:30
SinTwo
43736e8e3d Quick Shorts Fix
Just a quick path fix for icons.
2015-12-31 20:20:18 -05:00
Zuhayr
e3735bfbee Cleaning up some holder/scoop/climbing code. 2016-01-01 10:30:05 +10:30
SinTwo
b0916167c0 Adds new PDA sprites. 2015-12-31 15:19:11 -05:00
Hubblenaut
75c78fc3c9 Changes to Confused Moving 2015-12-31 02:28:35 +01:00
Chinsky
7ad106349c Merge pull request #11749 from headswe/soulstone_fix
Fixes #11711 & Refractors soulstone.dm
2015-12-31 00:36:14 +03:00
PsiOmegaDelta
059d9cd131 Re-fixes skin tone not displaying the proper value when being edited in the character setup. 2015-12-30 16:29:41 +01:00
PsiOmegaDelta
cacdb48863 Can now load/save/reload while readied.
The load window also no longer pops under the character setup screen.
Just some small character preference QoL changes.
2015-12-30 16:29:35 +01:00
Zuhayr
4456a8c424 Added gear harnesses to the loadout. 2015-12-29 21:26:06 +10:30
Neerti
59c1773286 Merge pull request #687 from Datraen/EAL-Speaker-Tweak
EAL given to Cyborgs, AI and pAI.
2015-12-28 23:47:41 -05:00
Datraen
48d0d6bb39 EAL given to Cyborgs, AI and pAI. 2015-12-28 20:32:41 -05:00
Sebastian Broberg
14393ea706 Few refraction 2015-12-27 17:05:08 +01:00
Zuhayr
1617a43685 Applying Harpy's prosthetic limb damage fix. 2015-12-27 17:27:19 +10:30
mwerezak
8b685fdf8f Fixes #11380 2015-12-27 01:39:34 -05:00
mwerezak
b30f81c7ea Fixes #11381 2015-12-27 01:28:41 -05:00
Neerti
39bb0acd42 Merge pull request #570 from GinjaNinja32/pl-chemistry
revert chemical dispenser revert
2015-12-26 19:47:25 -05:00
PsiOmegaDelta
da0a4c47cf Merge pull request #11756 from Baystation12/master
Dev-freeze
2015-12-26 11:58:42 +01:00
Zuhayr
4169bac4cb Merge pull request #11754 from PsiOmegaDelta/151225-StackThoseCablesRightHereRightNow
Can now join compatible cable coils of any type.
2015-12-26 18:23:43 +10:30
Sebastian Broberg
370529bc42 Refractored soulstone.dm
Split the various functions of the proc into multiple procs
Moved the transfer_soul proc under the soulstone object.
2015-12-25 13:04:13 +01:00
Sebastian Broberg
b000ca4eb7 Boop, logic escaped me also refractor this shit someone. 2015-12-25 11:30:33 +01:00
PsiOmegaDelta
faec92b553 Can now join compatible cable coils of any type.
Partial backport of #11656. Fixes #10935.
2015-12-25 11:19:59 +01:00
GinjaNinja32
7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
GinjaNinja32
04006f5b9e fix human examine gender 2015-12-25 01:06:35 +00:00
Zuhayr
9f729aad0c Fixed weapon use by borgs. 2015-12-25 09:33:07 +10:30
Zuhayr
9df402b0de Fixes issues with burn repair surgery for robolimbs. 2015-12-25 08:50:58 +10:30
Sebastian Broberg
ebef6272b9 Fixes #11711
Should fix it.
2015-12-24 23:02:37 +01:00
GinjaNinja32
9dee0707e8 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-24 15:06:16 +00:00
Neerti
084ba448fa Merge pull request #652 from Zuhayr/nerf
Added Nerf weapons to Cargo.
2015-12-24 06:47:48 -05:00
Zuhayr
e555c8432f Merge pull request #640 from Neerti/12/21/2015_event_tweaks
Random Event Tweaks
2015-12-24 22:11:19 +10:30
Zuhayr
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +10:30
Zuhayr
8602f07d31 Allowed grenades to be stuffed into mouths and primed. 2015-12-24 21:55:05 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options.
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
Zuhayr
53b2c6be80 Merge pull request #11737 from PsiOmegaDelta/151223-Paralysis
Adds a paralyze button for easier administration
2015-12-23 23:28:37 +10:30
PsiOmegaDelta
70b84d87a6 Tweaks permission rights. 2015-12-23 13:01:03 +01:00
Datraen
65f68602e7 Adds a longer timer to paralyze, allows for other mobs to fall under this proc.
Conflicts:
	code/modules/admin/admin.dm
2015-12-23 12:57:43 +01:00
Datraen
c5912b988c Adds a paralyze button for easy administration.
Conflicts:
	code/modules/admin/admin.dm
2015-12-23 12:56:48 +01:00
PsiOmegaDelta
f54dd94a66 Merge pull request #11735 from Baystation12/master
Dev-freeze
2015-12-23 11:33:35 +01:00